Merge pull request dewski#28 from tanelj/master

Fixed issue where it was impossible to turn off JSON callback wrapping
netconstructor · Jul 1, 2012 · bf764da · bf764da
2 parents 93c314c + 559f8ca
commit bf764da
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/json_builder/compiler.rb b/lib/json_builder/compiler.rb
@@ -44,9 +44,9 @@ def generate(*args, &block)
     # Returns instance of JSONBuilder::Compiler.
     def initialize(options={})
       @_members = []
-      @_scope = options[:scope]
+      @_scope = options.fetch(:scope, nil)
-      @_callback = options[:callback] || true
+      @_callback = options.fetch(:callback, true)
-      @_pretty_print = options[:pretty] || false
+      @_pretty_print = options.fetch(:pretty, false)
 
       # Only copy instance variables if there is a scope and presence of Rails
       copy_instance_variables_from(@_scope) if @_scope