Commit 3cba7a80 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Unify naming of JsDuck::Process::* classes.

parent 3686ee96

lib/jsduck/batch_parser.rb

+6 −6
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ require 'jsduck/aggregator' 
require 'jsduck/class'

require 'jsduck/relations'

require 'jsduck/logger'

require 'jsduck/process/ignore'

require 'jsduck/process/enum'

require 'jsduck/process/ignored_classes'

require 'jsduck/process/enums'

require 'jsduck/process/accessors'

require 'jsduck/process/ext4_events'

require 'jsduck/process/override'

require 'jsduck/process/overrides'

require 'jsduck/process/inherit_doc'

require 'jsduck/process/importer'

require 'jsduck/process/return_values'
@@ -64,12 +64,12 @@ module JsDuck 
      agr.create_global_class

      classes = agr.classes



      Process::Ignore.new(classes).process_all!

      Process::IgnoredClasses.new(classes).process_all!

      Process::Accessors.new(classes).process_all!

      Process::Ext4Events.new(classes, @opts).process_all!

      Process::Enum.new(classes).process_all!

      Process::Enums.new(classes).process_all!

      # Ignore override classes after applying them to actual classes

      @opts.external_classes += Process::Override.new(classes).process_all!

      @opts.external_classes += Process::Overrides.new(classes).process_all!



      classes.values

    end

lib/jsduck/process/enum.rb→lib/jsduck/process/enums.rb

+5 −5
Original line number Diff line number Diff line 
module JsDuck

  module Process



    class Enum

      def initialize(classes)

        @classes = classes

    class Enums

      def initialize(classes_hash)

        @classes_hash = classes_hash

      end



      # Applies additional processing to all enum-classes.

      def process_all!

        @classes.each_value do |cls|

        @classes_hash.each_value do |cls|

          if cls[:enum]

            process(cls)

          end
@@ -54,7 +54,7 @@ module JsDuck 
      end



      def each_alias(prefix)

        @classes.each_value do |cls|

        @classes_hash.each_value do |cls|

          if cls[:aliases] && cls[:aliases][prefix]

            cls[:aliases][prefix].each {|name| yield(name, cls) }

          end

lib/jsduck/process/ignore.rb→lib/jsduck/process/ignored_classes.rb

+16 −0
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ module JsDuck 
  module Process



    # Gets rid of classes marked with @ignore

    class Ignore

      def initialize(classes)

        @classes = classes

    class IgnoredClasses

      def initialize(classes_hash)

        @classes_hash = classes_hash

      end



      def process_all!

        @classes.delete_if {|name, cls| cls[:ignore] }

        @classes_hash.delete_if {|name, cls| cls[:ignore] }

      end

    end

lib/jsduck/process/override.rb→lib/jsduck/process/overrides.rb

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ require 'jsduck/logger' 
module JsDuck

  module Process



    class Override

    class Overrides

      def initialize(classes_hash)

        @classes_hash = classes_hash

      end

spec/aggregator_enum_spec.rb

+2 −2
Original line number Diff line number Diff line 
require "jsduck/aggregator"

require "jsduck/source/file"

require "jsduck/process/enum"

require "jsduck/process/enums"



describe JsDuck::Aggregator do

  def parse(string)

    agr = JsDuck::Aggregator.new

    agr.aggregate(JsDuck::Source::File.new(string))

    JsDuck::Process::Enum.new(agr.classes).process_all!

    JsDuck::Process::Enums.new(agr.classes).process_all!

    agr.result

  end