Commit 8d2cae1c authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Rename JsDuck::JsonDuck to JsDuck::Util::Json.

parent 8e233982

lib/jsduck/app.rb

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ require 'jsduck/inherit_doc' 
require 'jsduck/parallel_wrap'

require 'jsduck/logger'

require 'jsduck/assets'

require 'jsduck/json_duck'

require 'jsduck/util/json'

require 'jsduck/util/io'

require 'jsduck/importer'

require 'jsduck/return_values'
@@ -39,7 +39,7 @@ module JsDuck 
      # Set to 0 to disable parallelization completely.

      ParallelWrap.in_processes = @opts.processes

      # Turn JSON pretty-printing on/off

      JsonDuck.pretty = @opts.pretty_json

      Util::Json.pretty = @opts.pretty_json

    end



    # Call this after input parameters set

lib/jsduck/app_data.rb

+2 −2
Original line number Diff line number Diff line 
require 'jsduck/json_duck'

require 'jsduck/util/json'

require 'jsduck/icons'

require 'jsduck/search_data'

require 'jsduck/meta_tag_registry'
@@ -15,7 +15,7 @@ module JsDuck 


    # Writes classes, guides, videos, and search data to one big .js file

    def write(filename)

      js = "Docs = " + JsonDuck.generate({

      js = "Docs = " + Util::Json.generate({

        :data => {

          :classes => Icons.new.create(@relations.classes),

          :guides => @assets.guides.to_array,

lib/jsduck/categories.rb

+0 −1
Original line number Diff line number Diff line 
require 'jsduck/logger'

require 'jsduck/json_duck'

require 'jsduck/file_categories'

require 'jsduck/auto_categories'

lib/jsduck/class_writer.rb

+3 −2
Original line number Diff line number Diff line 
require 'jsduck/parallel_wrap'

require 'jsduck/logger'

require 'jsduck/stdout'

require 'jsduck/util/json'

require 'fileutils'



module JsDuck
@@ -36,9 +37,9 @@ module JsDuck 
        # skip file if exporter returned nil

        if json

          if extension == ".json"

            JsonDuck.write_json(filename, json)

            Util::Json.write_json(filename, json)

          elsif extension == ".js"

            JsonDuck.write_jsonp(filename, cls[:name].gsub(/\./, "_"), json)

            Util::Json.write_jsonp(filename, cls[:name].gsub(/\./, "_"), json)

          else

            throw "Unexpected file extension: #{extension}"

          end

lib/jsduck/examples.rb

+2 −2
Original line number Diff line number Diff line 
require 'jsduck/json_duck'

require 'jsduck/util/json'

require 'jsduck/null_object'

require 'jsduck/grouped_asset'
@@ -17,7 +17,7 @@ module JsDuck 


    # Parses examples config file

    def initialize(filename, opts)

      @groups = JsonDuck.read(filename)

      @groups = Util::Json.read(filename)

      @opts = opts

      fix_examples_data

      build_map_by_name("Two examples have the same name", filename)