jbuilder 0.4.3 → 0.5.0

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec
+
+gem "actionpack"

data/Gemfile.lock

@@ -1,20 +1,50 @@
 PATH
   remote: .
   specs:
-    jbuilder (0.3)
+    jbuilder (0.4.1)
       activesupport (>= 3.0.0)
       blankslate (>= 2.1.2.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.3)
+    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)
     blankslate (2.1.2.4)
-    multi_json (1.0.4)
+    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)
+    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!

data/jbuilder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '0.4.3'
+  s.version = '0.5.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'

data/lib/jbuilder.rb

@@ -5,21 +5,50 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/json'
 require 'multi_json'
 class Jbuilder < BlankSlate
+  class KeyFormatter
+    def initialize(*args)
+      @format = {}
+      @cache = {}
+
+      options = args.extract_options!
+      args.each do |name|
+        @format[name] = []
+      end
+      options.each do |name, paramaters|
+        @format[name] = paramaters
+      end
+    end
+
+    def initialize_copy(original)
+      @cache = {}
+    end
+
+    def format(key)
+      @cache[key] ||= @format.inject(key.to_s) do |result, args|
+        func, args = args
+        if func.is_a? Proc
+          func.call(result, *args)
+        else
+          result.send(func, *args)
+        end
+      end
+    end
+  end
+  
   # Yields a builder and automatically turns the result into a JSON string
   def self.encode
     new._tap { |jbuilder| yield jbuilder }.target!
   end
 
-  @@key_format = {}
+  @@key_formatter = KeyFormatter.new
 
   define_method(:__class__, find_hidden_method(:class))
   define_method(:_tap, find_hidden_method(:tap))
-  define_method(:_is_a?, find_hidden_method(:is_a?))
   reveal(:respond_to?)
 
-  def initialize(key_format = @@key_format.clone)
+  def initialize(key_formatter = @@key_formatter.clone)
     @attributes = ActiveSupport::OrderedHash.new
-    @key_format = key_format
+    @key_formatter = key_formatter
   end
 
   # Dynamically set a key value pair.
@@ -42,7 +71,7 @@ class Jbuilder < BlankSlate
     if block_given?
       _yield_nesting(key) { |jbuilder| yield jbuilder }
     else
-      @attributes[_format_key(key)] = value
+      _set_value(key, value)
     end
   end
 
@@ -75,12 +104,12 @@ class Jbuilder < BlankSlate
   #   { "_first_name": "David" }
   #
   def key_format!(*args)
-    __class__.extract_key_format(args, @key_format)
+    @key_formatter = KeyFormatter.new(*args)
   end
   
   # Same as the instance method key_format! except sets the default.
   def self.key_format(*args)
-    extract_key_format(args, @@key_format)
+    @@key_formatter = KeyFormatter.new(*args)
   end
 
   # Turns the current element into an array and yields a builder to add a hash.
@@ -129,19 +158,22 @@ class Jbuilder < BlankSlate
   #
   #   { "people": [ { "name": David", "age": 32 }, { "name": Jamie", "age": 31 } ] }
   def array!(collection)
-    @attributes = [] and return if collection.empty?
-    
-    collection.each do |element|
-      child! do |child|
-        yield child, element
-      end
+    @attributes = []
+    collection.each do |element| #[] and return if collection.empty?
+      @attributes << _new_instance._tap { |jbuilder| yield jbuilder, element }.attributes!
     end
   end
 
-  # Extracts the mentioned attributes from the passed object and turns them into attributes of the JSON.
+  # Extracts the mentioned attributes or hash elements from the passed object and turns them into attributes of the JSON.
   #
   # Example:
   #
+  #   @person = Struct.new(:name, :age).new("David", 32)
+  #
+  #   or you can utilize a Hash
+  #
+  #   @person = {:name => "David", :age => 32}
+  #
   #   json.extract! @person, :name, :age
   #
   #   { "name": David", "age": 32 }, { "name": Jamie", "age": 31 }
@@ -150,18 +182,19 @@ class Jbuilder < BlankSlate
   #
   #   json.(@person, :name, :age)
   def extract!(object, *attributes)
-    attributes.each do |attribute|
-      __send__ attribute, object.send(attribute)
+    if object.is_a?(Hash)
+      attributes.each {|attribute| _set_value attribute, object.send(:fetch, attribute)}
+    else
+      attributes.each {|attribute| _set_value attribute, object.send(attribute)}
     end
   end
 
   if RUBY_VERSION > '1.9'
-    def call(*args)
-      case
-      when args.one?
-        array!(args.first) { |json, element| yield json, element }
-      when args.many?
-        extract!(*args)
+    def call(object = nil, *attributes)
+      if attributes.empty?
+        array!(object) { |json, element| yield json, element }
+      else
+        extract!(object, *attributes)
       end
     end
   end
@@ -177,67 +210,71 @@ class Jbuilder < BlankSlate
   end
 
 
-  private
-    def method_missing(method, *args)
-      case
-      # json.age 32
-      # json.person another_jbuilder
-      # { "age": 32, "person": { ...  }
-      when args.one? && args.first.respond_to?(:_is_a?) && args.first._is_a?(Jbuilder)
-        set! method, args.first.attributes!
-
-      # json.comments @post.comments { |json, comment| ... }
-      # { "comments": [ { ... }, { ... } ] }
-      when args.one? && block_given?
-        _yield_iteration(method, args.first) { |child, element| yield child, element }
-
-      # json.age 32
-      # { "age": 32 }
-      when args.length == 1
-        set! method, args.first
-
-      # json.comments { |json| ... }
-      # { "comments": ... }
-      when args.empty? && block_given?
-        _yield_nesting(method) { |jbuilder| yield jbuilder }
+  protected
+    def _set_value(key, value)
+      @attributes[@key_formatter.format(key)] = value
+    end
 
-      # json.comments(@post.comments, :content, :created_at)
-      # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
-      when args.many? && args.first.respond_to?(:each)
-        _inline_nesting method, args.first, args.from(1)
 
-      # json.author @post.creator, :name, :email_address
-      # { "author": { "name": "David", "email_address": "david@loudthinking.com" } }
-      when args.many?
-        _inline_extract method, args.first, args.from(1)
+  private
+    def method_missing(method, value = nil, *args)
+      if block_given?
+        if value
+          # json.comments @post.comments { |json, comment| ... }
+          # { "comments": [ { ... }, { ... } ] }
+          _yield_iteration(method, value) { |child, element| yield child, element }
+        else
+          # json.comments { |json| ... }
+          # { "comments": ... }
+          _yield_nesting(method) { |jbuilder| yield jbuilder }
+        end
+      else
+        if args.empty?
+          if Jbuilder === value
+            # json.age 32
+            # json.person another_jbuilder
+            # { "age": 32, "person": { ...  }
+            _set_value method, value.attributes!
+          else
+            # json.age 32
+            # { "age": 32 }
+            _set_value method, value
+          end
+        else
+          if value.respond_to?(:each)
+            # json.comments(@post.comments, :content, :created_at)
+            # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
+            _inline_nesting method, value, args
+          else
+            # json.author @post.creator, :name, :email_address
+            # { "author": { "name": "David", "email_address": "david@loudthinking.com" } }
+            _inline_extract method, value, args
+          end
+        end
       end
     end
 
     # Overwrite in subclasses if you need to add initialization values
     def _new_instance
-      __class__.new(@key_format)
+      __class__.new(@key_formatter)
     end
 
     def _yield_nesting(container)
-      set! container, _new_instance._tap { |jbuilder| yield jbuilder }.attributes!
+      _set_value container, _new_instance._tap { |jbuilder| yield jbuilder }.attributes!
     end
 
     def _inline_nesting(container, collection, attributes)
-      __send__(container) do |parent|
-        parent.array!(collection) and return if collection.empty?
-        
-        collection.each do |element|
-          parent.child! do |child|
-            attributes.each do |attribute|
-              child.__send__ attribute, element.send(attribute)
-            end
+      _yield_nesting(container) do |parent|
+        parent.array!(collection) do |child, element|
+          attributes.each do |attribute|
+            child._set_value attribute, element.send(attribute)
           end
         end
       end
     end
     
     def _yield_iteration(container, collection)
-      __send__(container) do |parent|
+      _yield_nesting(container) do |parent|
         parent.array!(collection) do |child, element|
           yield child, element
         end
@@ -245,29 +282,7 @@ class Jbuilder < BlankSlate
     end
     
     def _inline_extract(container, record, attributes)
-      __send__(container) { |parent| parent.extract! record, *attributes }
-    end
-
-    # Format the key using the methods described in @key_format
-    def _format_key(key)
-      @key_format.inject(key.to_s) do |result, args|
-        func, args = args
-        if func.is_a? Proc
-          func.call(result, *args)
-        else
-          result.send(func, *args)
-        end
-      end
-    end
-
-    def self.extract_key_format(args, target)
-      options = args.extract_options!
-      args.each do |name|
-        target[name] = []
-      end
-      options.each do |name, paramaters|
-        target[name] = paramaters
-      end
+      _yield_nesting(container) { |parent| parent.extract! record, *attributes }
     end
 end
 

data/lib/jbuilder_template.rb

@@ -3,9 +3,9 @@ class JbuilderTemplate < Jbuilder
     new(context)._tap { |jbuilder| yield jbuilder }.target!
   end
 
-  def initialize(context)
+  def initialize(context, *args)
     @context = context
-    super()
+    super(*args)
   end
 
   def partial!(options, locals = {})
@@ -21,7 +21,7 @@ class JbuilderTemplate < Jbuilder
 
   private
     def _new_instance
-      __class__.new(@context)
+      __class__.new(@context, @key_formatter)
     end
 end
 

data/test/jbuilder_template_test.rb

@@ -0,0 +1,39 @@
+require 'test/unit'
+require 'active_support/test_case'
+require 'active_support/inflector'
+require 'action_dispatch'
+require 'action_view'
+
+require 'jbuilder'
+require 'jbuilder_template'
+
+class JbuilderTemplateTest < ActiveSupport::TestCase
+  test "rendering" do
+    json = JbuilderTemplate.encode(binding) do |json|
+      json.content "hello"
+    end
+    
+    assert_equal "hello", JSON.parse(json)["content"]
+  end
+
+  test "key_format! with parameter" do
+    json = JbuilderTemplate.new(binding)
+    json.key_format! :camelize => [:lower]
+    json.camel_style "for JS"
+
+    assert_equal ['camelStyle'], json.attributes!.keys
+  end
+
+  test "key_format! propagates to child elements" do
+    json = JbuilderTemplate.new(binding)
+    json.key_format! :upcase
+    json.level1 "one"
+    json.level2 do |json|
+      json.value "two"
+    end
+
+    result = json.attributes!
+    assert_equal "one", result["LEVEL1"]
+    assert_equal "two", result["LEVEL2"]["VALUE"]
+  end
+end

data/test/jbuilder_test.rb

@@ -67,7 +67,20 @@ class JbuilderTest < ActiveSupport::TestCase
       assert_equal 32, parsed["age"]
     end
   end
-  
+
+  test "extracting from hash" do
+    person = {:name => "Jim", :age => 34}
+
+    json = Jbuilder.encode do |json|
+      json.extract! person, :name, :age
+    end
+
+    JSON.parse(json).tap do |parsed|
+      assert_equal "Jim", parsed["name"]
+      assert_equal 34, parsed["age"]
+    end
+  end
+
   test "nesting single child with block" do
     json = Jbuilder.encode do |json|
       json.author do |json|
@@ -356,6 +369,13 @@ class JbuilderTest < ActiveSupport::TestCase
     json.camel_style "for JS"
 
     assert_equal ['camelStyle'], json.attributes!.keys
-    Jbuilder.class_variable_set("@@key_format", {})
+    Jbuilder.class_variable_set("@@key_formatter", Jbuilder::KeyFormatter.new)
+  end
+
+  test "don't use default key formatter directly" do
+    json = Jbuilder.new
+    json.key "value"
+
+    assert_equal [], Jbuilder.class_variable_get("@@key_formatter").instance_variable_get("@cache").keys
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160638200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160638200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &2160637580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 2.1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *2160637580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2.4
 description: 
 email: david@37signals.com
 executables: []
@@ -41,12 +51,12 @@ extra_rdoc_files: []
 files:
 - ./Gemfile
 - ./Gemfile.lock
-- ./jbuilder-0.4.2.gem
 - ./jbuilder.gemspec
 - ./lib/jbuilder.rb
 - ./lib/jbuilder_template.rb
 - ./MIT-LICENSE
 - ./README.md
+- ./test/jbuilder_template_test.rb
 - ./test/jbuilder_test.rb
 homepage: 
 licenses: []
@@ -68,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Create JSON structures via a Builder-style DSL