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

Rename JsDuck::IO to JsDuck::Util::IO.

parent a4d5fd5b

lib/jsduck/app.rb

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

require 'jsduck/assets'

require 'jsduck/json_duck'

require 'jsduck/io'

require 'jsduck/util/io'

require 'jsduck/importer'

require 'jsduck/return_values'

require 'jsduck/lint'
@@ -109,7 +109,7 @@ module JsDuck 
      ParallelWrap.map(filenames) do |fname|

        Logger.instance.log("Parsing", fname)

        begin

          Source::File.new(JsDuck::IO.read(fname), fname, @opts)

          Source::File.new(Util::IO.read(fname), fname, @opts)

        rescue

          Logger.instance.fatal_backtrace("Error while parsing #{fname}", $!)

          exit(1)

lib/jsduck/guides.rb

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

require 'jsduck/json_duck'

require 'jsduck/io'

require 'jsduck/util/io'

require 'jsduck/null_object'

require 'jsduck/logger'

require 'jsduck/grouped_asset'
@@ -69,7 +69,7 @@ module JsDuck 
        name = File.basename(in_dir)

        @formatter.img_path = "guides/#{name}"



        return add_toc(guide, @formatter.format(JsDuck::IO.read(guide_file)))

        return add_toc(guide, @formatter.format(Util::IO.read(guide_file)))

      rescue

        Logger.instance.fatal_backtrace("Error while reading/formatting guide #{in_dir}", $!)

        exit(1)

lib/jsduck/index_html.rb

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

require 'jsduck/io'

require 'jsduck/util/io'

require 'fileutils'



module JsDuck
@@ -50,7 +50,7 @@ module JsDuck 
    # Opens in_file, replaces {keys} inside it, writes to out_file

    def write_template(in_file, out_file, replacements)

      Logger.instance.log("Writing", out_file)

      html = JsDuck::IO.read(in_file)

      html = Util::IO.read(in_file)

      html.gsub!(/\{\w+\}/) do |key|

        replacements[key] ? replacements[key] : key

      end

lib/jsduck/io.rb

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
module JsDuck



  # A helper to use instead the builtin IO class to read files in

  # correct encoding.

  #

  # By default in Ruby 1.9 the encoding is auto-detected, which can

  # have surprising results.  So in here we read in all files in UTF-8

  # (the default) or in some other encoding specified through --encoding

  # option and convert it to UTF-8 internally.

  class IO

    @@encoding = "UTF-8"



    # Sets the external encoding to be used for reading files.

    # When it's different from UTF-8, the input will be converted to UTF-8.

    def self.encoding=(e)

      if e =~ /^UTF-8$/i

        @@encoding = e

      else

        @@encoding = e+":UTF-8"

      end

    end



    # Reads given filename into string

    def self.read(filename)

      File.open(filename, "r:"+@@encoding) {|f| f.read }

    end



  end



end

lib/jsduck/json_duck.rb

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

require 'jsduck/util/io'

require 'jsduck/logger'

require 'json'
@@ -36,7 +36,7 @@ module JsDuck 
    # Reads and parses JSON from file

    def self.read(filename)

      begin

        self.parse(JsDuck::IO.read(filename))

        self.parse(Util::IO.read(filename))

      rescue

        Logger.instance.fatal("#{filename} is not a valid JSON file")

        exit(1)