json_builder 2.0.6 → 3.0.0

data/Rakefile

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+  Bundler::GemHelper.install_tasks
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rake'
+require 'rake/task'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+# Rake::Task.new(:rdoc) do |rdoc|
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title    = 'JsonBuilder'
+#   rdoc.options << '--line-numbers' << '--inline-source'
+#   rdoc.rdoc_files.include('README.rdoc')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end

data/lib/json_builder.rb

@@ -1,3 +1,3 @@
 require 'json_builder/version'
-require 'json_builder/generator'
+require 'json_builder/compiler'
 require 'json_builder/template' if defined? Rails

data/lib/json_builder/compiler.rb

@@ -0,0 +1,63 @@
+require 'blankslate' unless defined? BlankSlate
+require 'json_builder/member'
+
+module JSONBuilder
+  class Compiler < BlankSlate
+    class << self
+      def generate(*args, &block)
+        options = args.extract_options!
+        compiler = self.new(options)
+        compiler.compile(*args, &block)
+        compiler.to_s
+      end
+    end
+    
+    attr_accessor :members
+    attr_accessor :array
+    attr_accessor :scope
+    attr_accessor :callback
+    attr_accessor :pretty_print
+    
+    def initialize(options={})
+      @members = []
+      @scope = options[:scope]
+      @callback = options[:callback]
+      @pretty_print = options[:pretty]
+    end
+    
+    def compile(*args, &block)
+      instance_exec(*args, &block)
+    end
+    
+    def array(items, &block)
+      @array = Elements.new(items, &block)
+    end
+    
+    # Need to return a Key instance to allow for arrays to be handled appropriately
+    def method_missing(key, *args, &block)
+      member = Member.new(key, *args, &block)
+      @members << member
+      member
+    end
+    alias_method :key, :method_missing
+    
+    # Once all nodes are compiled, build the string
+    def to_s
+      include_callback @array ? @array.to_s : "{#{@members.collect(&:to_s).join(', ')}}"
+    end
+    
+    private
+    
+    def include_callback(json)
+      @callback && request_params[:callback] ? "#{request_params[:callback]}(#{pretty_print(json)})" : pretty_print(json)
+    end
+    
+    def pretty_print(json)
+      @pretty_print ? JSON.pretty_generate(JSON[json]) : json
+    end
+    
+    def request_params
+      @scope.respond_to?(:params) ? @scope.params : {}
+    end
+  end
+end

data/lib/json_builder/elements.rb

@@ -0,0 +1,17 @@
+module JSONBuilder
+  class Elements
+    attr_accessor :compilers
+    
+    def initialize(items, &block)
+      @compilers = []
+      
+      items.compact.each do |item|
+        @compilers << Value.new(item, &block)
+      end
+    end
+    
+    def to_s
+      "[#{@compilers.collect(&:to_s).join(', ')}]"
+    end
+  end
+end

data/lib/json_builder/member.rb

@@ -0,0 +1,24 @@
+require 'json_builder/value'
+require 'json_builder/elements'
+
+module JSONBuilder
+  class Member
+    attr_accessor :key
+    attr_accessor :value
+    
+    def initialize(key, *args, &block)
+      @key = key
+
+      argument = args.shift
+      if argument.is_a?(Array)
+        @value = Elements.new(argument, &block)
+      else
+        @value = Value.new(argument, &block)
+      end
+    end
+    
+    def to_s
+      "\"#{@key}\": #{@value}"
+    end
+  end
+end

data/lib/json_builder/template.rb

@@ -1,27 +1,53 @@
-require 'action_view/base'
-require 'action_view/template'
-
 module ActionView #:nodoc:
   class Base
     cattr_accessor :pretty_print_json
-    @@pretty_print_json = false
+    @@pretty_print_json = defined?(Rails) && Rails.env.development?
+    
+    cattr_accessor :json_callback
+    @@json_callback = true
   end
 end
 
-module ActionView
-  module Template::Handlers
-    class JSONBuilder < Template::Handler
-      include Compilable
+# Rails 2.X Template
+if defined?(Rails) && Rails.version =~ /^2/
+  require 'action_view/base'
+  require 'action_view/template'
 
-      self.default_format = Mime::JSON
+  module ActionView
+    module TemplateHandlers
+      class JSONBuilder < TemplateHandler
+        include Compilable
 
-      def compile(template)
-        "json = ::JSONBuilder::Generator.new(:pretty => #{ActionView::Base.pretty_print_json});" +
-          template.source +
-        ";json.compile!;"
+        def compile(template)
+          "::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {#{template.source}};"
+        end
       end
     end
   end
+
+  ActionView::Template.register_template_handler :json_builder, ActionView::TemplateHandlers::JSONBuilder
 end
 
-ActionView::Template.register_template_handler :json_builder, ActionView::Template::Handlers::JSONBuilder
+# Rails 3.X Template
+if defined?(Rails) && Rails.version =~ /^3/
+  module ActionView
+    module Template::Handlers
+      class JSONBuilder
+        class_attribute :default_format
+        self.default_format = Mime::JSON
+
+        def self.call(template)
+          source = if template.source.empty?
+            File.read(template.identifier)
+          else # use source
+            template.source
+          end
+
+          "::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {#{source}};"
+        end
+      end
+    end
+  end
+
+  ActionView::Template.register_template_handler :json_builder, ActionView::Template::Handlers::JSONBuilder
+end

data/lib/json_builder/value.rb

@@ -0,0 +1,30 @@
+require 'active_support/time'
+
+module JSONBuilder
+  class Value
+    attr_accessor :value
+    
+    def initialize(arg, &block)
+      if block_given?
+        @value = Compiler.new
+        compiled = @value.compile(*arg, &block)
+        
+        # For the use case that the passed in block returns a non-member object
+        # or normal Ruby object
+        @value = compiled unless compiled.is_a?(Member)
+      else
+        @value = arg
+      end
+    end
+    
+    def to_s
+      case @value
+      when String, TrueClass, FalseClass then @value.inspect
+      when Hash then @value.to_json
+      when NilClass then 'null'
+      when Time, Date, DateTime then @value.iso8601.inspect
+      else @value.to_s
+      end
+    end
+  end
+end

data/lib/json_builder/version.rb

@@ -1,3 +1,3 @@
 module JSONBuilder
-  VERSION = '2.0.6'.freeze
+  VERSION = '3.0.0'
 end

data/spec/benchmarks/builder.rb

@@ -0,0 +1,60 @@
+$:.push File.expand_path('../../../lib', __FILE__)
+require 'rubygems'
+require 'benchmark'
+require 'builder'
+require 'json_builder/compiler'
+
+Benchmark.bm do |b|
+  b.report('JSONBuilder') do
+    15_000.times {
+      JSONBuilder::Compiler.generate {
+        name "Garrett Bjerkhoel"
+        birthday Time.local(1991, 9, 14)
+        street do
+          address "1143 1st Ave"
+          address2 "Apt 200"
+          city "New York"
+          state "New York"
+          zip 10065
+        end
+        skills do
+          ruby true
+          asp false
+          php true
+          mysql true
+          mongodb true
+          haproxy true
+          marathon false
+        end
+        single_skills ['ruby', 'php', 'mysql', 'mongodb', 'haproxy']
+        booleans [true, true, false, nil] 
+      }
+    }
+  end
+  b.report('Builder') do
+    15_000.times {
+      xml = Builder::XmlMarkup.new(:indent => 2)
+      xml.name "Garrett Bjerkhoel"
+      xml.birthday Time.local(1991, 9, 14)
+      xml.street do
+        xml.address "1143 1st Ave"
+        xml.address2 "Apt 200"
+        xml.city "New York"
+        xml.state "New York"
+        xml.zip 10065
+      end
+      xml.skills do
+        xml.ruby true
+        xml.asp false
+        xml.php true
+        xml.mysql true
+        xml.mongodb true
+        xml.haproxy true
+        xml.marathon false
+      end
+      xml.single_skills ['ruby', 'php', 'mysql', 'mongodb', 'haproxy']
+      xml.booleans [true, true, false, nil]
+      xml.target!
+    }
+  end
+end

data/spec/dummy/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+Dummy::Application.load_tasks

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/spec/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,5 @@
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+end

data/spec/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/dummy/app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,9 @@
+class User < ActiveRecord::Base
+  def disabled?
+    false
+  end
+  
+  def activated?
+    true
+  end
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag :all %>
+  <%= javascript_include_tag :defaults %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/dummy/app/views/users/index.json_builder

@@ -0,0 +1,3 @@
+testing ["1", 2, true] do |t|
+  variable t
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/spec/dummy/config/application.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../boot', __FILE__)
+
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+
+Bundler.require
+require "json_builder"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000