yard-sketchup 1.0.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bebdce209cac8110d5d0d3a303f75595b3de7fa7dcaf5929e82074c223f367
-  data.tar.gz: 0f8e28fc2c450acaf5e768cd502a0bd1f2e376318f3c3c8f9394278a112bd58c
+  metadata.gz: b423474c8d87b8f7f225b0b9711005e4cce42cdae47f40b8016b0a8dc7336525
+  data.tar.gz: 50c9651f436c50cda5c46bb3682a16d4141bd7c380c0e174fb724fbd98376720
 SHA512:
-  metadata.gz: 997b7d58b5c35972834cf14ae082fa44e8e26146fd86cf0239adfbd5a548caca3bfbef855c1341255cf9dc93242a451c91365db35862afa2955376bb262d7953
-  data.tar.gz: 6313c798ed9e2e87900114c8a0de01be265cfa6c3ae0319615b2e18bdebe24b38cea8308efae29be8f640bf8eaa412e58f2c6cedb9d1aed6d7f6c4a1bec93aa6
+  metadata.gz: 34e49e6029571fd60cd6b73995a5859af78f991ee252d09b63f8bd5270a0f8a118830ce79a6d281a103c5a1e3c6d78fe26e9d4a3f9463993f3caa47b92abfd3a
+  data.tar.gz: e96a7090401e217445ebd31c05394b558d298017ed5dc24b353dbb777197216f7f4dbb3fb05d84900867a980839e09068f3507fd14a6cecb58c6faf9fc7bef6e

data/lib/yard-sketchup.rb

@@ -1,9 +1,11 @@
 require 'yard'
 require 'yard-sketchup/version'
+require 'yard-sketchup/stubs/autoload'
 require 'yard-sketchup/yard/logger'
 require 'yard-sketchup/yard/handlers/class_constants'
 require 'yard-sketchup/yard/handlers/class_enum_constants'
 require 'yard-sketchup/yard/handlers/global_constants'
+require 'yard-sketchup/patches/c_base_handler'
 
 module SketchUpYARD
 

data/lib/yard-sketchup/patches/c_base_handler.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module YARD
+  module Handlers
+    module C
+      class Base < Handlers::Base
+
+        # Temporary workaround until a proper fix can be applied to YARD master.
+        alias_method :namespace_for_variable_original, :namespace_for_variable
+        def namespace_for_variable(var)
+          patch_namespace_for_variable(var) ||
+              namespace_for_variable_original(var)
+        end
+
+        private
+
+        def patch_namespace_for_variable(var)
+          name = PATCH_ERROR_NAME[var]
+          # $stderr.puts "Mapped #{var} to #{name}" if name
+          name.nil? ? nil : P(name)
+        end
+
+        # Generated by update_error_map.rb (Copy+past results)
+        PATCH_ERROR_NAME = {
+          'rb_eException' => 'Exception',
+          'rb_eSystemExit' => 'SystemExit',
+          'rb_eFatal' => 'fatal',
+          'rb_eSignal' => 'SignalException',
+          'rb_eInterrupt' => 'Interrupt',
+          'rb_eStandardError' => 'StandardError',
+          'rb_eTypeError' => 'TypeError',
+          'rb_eArgError' => 'ArgumentError',
+          'rb_eIndexError' => 'IndexError',
+          'rb_eKeyError' => 'KeyError',
+          'rb_eRangeError' => 'RangeError',
+          'rb_eScriptError' => 'ScriptError',
+          'rb_eSyntaxError' => 'SyntaxError',
+          'rb_eLoadError' => 'LoadError',
+          'rb_eNotImpError' => 'NotImplementedError',
+          'rb_eNameError' => 'NameError',
+          'rb_eNoMethodError' => 'NoMethodError',
+          'rb_eRuntimeError' => 'RuntimeError',
+          'rb_eFrozenError' => 'FrozenError',
+          'rb_eSecurityError' => 'SecurityError',
+          'rb_eNoMemError' => 'NoMemoryError',
+          'rb_eEncodingError' => 'EncodingError',
+          'rb_eSystemCallError' => 'SystemCallError',
+        }
+
+      end
+    end
+  end
+end

data/lib/yard-sketchup/stubs/autoload.rb

@@ -0,0 +1,134 @@
+module SketchUpYARD
+  module Stubs
+    class AutoLoadGenerator
+
+      # @param [YARD::CodeObject::Base] namespace_objects
+      # @param [IO] out
+      def generate(namespace_objects, out)
+        dependencies = resolve_dependencies(namespace_objects)
+        out.puts "# This file is auto-generated by the `thor stubs` command."
+        required = Set.new
+        # Top level is special case.
+        top_level_path = File.join(sketchup_stubs_path, '_top_level.rb')
+        out.puts "require '#{top_level_path}'"
+        # The rest is resolved recursively.
+        dependencies.each { |object|
+          recurse_require(object, required, out)
+        }
+      end
+
+      private
+
+      class Node
+
+        attr_reader :object
+        attr_reader :dependencies
+
+        def initialize(object)
+          @object = object
+          @dependencies = SortedSet.new
+        end
+
+        def root?
+          @object.namespace.root?
+        end
+
+        def path
+          @object.path
+        end
+
+        def namespace
+          @object.namespace
+        end
+
+        def <<(object)
+          @dependencies << object
+        end
+
+        def <=>(other)
+          @object.path <=> other.path
+        end
+
+        def hash
+          @object.path.hash
+        end
+
+      end
+
+
+      class NodeFactory
+
+        def initialize
+          @dependencies = {}
+        end
+
+        def node(yard_object)
+          item = @dependencies[yard_object.path]
+          return item if item
+          item = Node.new(yard_object)
+          @dependencies[yard_object.path] = item
+          item
+        end
+
+      end
+
+
+      def resolve_dependencies(yard_objects)
+        factory = NodeFactory.new
+        dependencies = SortedSet.new
+
+        yard_objects.each { |yard_object|
+          object = factory.node(yard_object)
+
+          if yard_object.type == :class && yard_object.superclass.name != :Object
+            object << factory.node(yard_object.superclass)
+          end
+
+          unless yard_object.namespace.path.empty?
+            object << factory.node(yard_object.namespace)
+          end
+
+          dependencies << object
+        }
+        dependencies
+      end
+
+      def print_dependencies(object, indent = 0)
+        indent_space = '  ' * indent
+        puts "#{indent_space}#{object.path}"
+        object.dependencies.each { |dependency|
+          print_dependencies(dependency, indent + 1)
+        }
+      end
+
+      def sketchup_stubs_path
+        File.join('sketchup-api-stubs', 'stubs')
+      end
+
+      def stub_filename(object)
+        basename = object.path.gsub('::', '/')
+        basename = '_top_level' if basename.empty?
+        File.join(sketchup_stubs_path, "#{basename}.rb")
+      end
+
+      def recurse_require(object, required, out, indent = 0)
+        return if required.include?(object.path)
+        # If a class inherit from a core Ruby class we might get a Proxy code
+        # object here. We don't generate stubs for those and thus we don't want
+        # to create a require for them either.
+        return if object.object.is_a?(YARD::CodeObjects::Proxy)
+        # First require the dependencies.
+        object.dependencies.each { |dependency|
+          recurse_require(dependency, required, out, indent + 1)
+        }
+        # Then we're good to require this object.
+        require_path = stub_filename(object)
+        # indent_space = '  ' * indent
+        # out.puts "#{indent_space}require '#{require_path}'"
+        out.puts "require '#{require_path}'"
+        required << object.path
+      end
+
+    end
+  end
+end

data/lib/yard-sketchup/templates/coverage/fulldoc/text/setup.rb

@@ -28,6 +28,9 @@ def generate_manifest
       # TODO(thomthom): Currently the manifest doesn't distinguish between
       # class and instance methods. This should be addressed, but we need to
       # update TestUp to handle this first.
+      # TODO(thomthom): Make this a configurable filter.
+      # Layout has its own tests - and should be isolated so its own suite.
+      next if method.namespace.to_s.start_with?('Layout')
       methods << "#{method.namespace}.#{method.name}"
     }
   end

data/lib/yard-sketchup/templates/default/fulldoc/html/css/sketchup.css

@@ -102,6 +102,16 @@ h2 small a {
 }
 
 
+p.signature .aliases,
+h3.signature .aliases {
+  color: #ccc;
+}
+p.signature .aliases .names,
+h3.signature .aliases .names {
+ color: #fff;
+}
+
+
 /* Ensure content is scrollable on small screens. */
 @media (max-width: 920px) {
   #main {

data/lib/yard-sketchup/templates/default/fulldoc/html/setup.rb

@@ -1,7 +1,29 @@
+# Helpers:
+
+# Copy verbatim an asset file to the target output. By default it uses the
+# same relative path as the source for the target path.
+def copy(source, target = nil)
+  path = self.class.find_file(source)
+  # puts "copy(#{source}, #{target})"
+  # puts "> path: #{path}"
+  raise ArgumentError, "no file for '#{source}' in #{self.class.path}" unless path
+  target ||= source
+  asset(target, File.binread(path))
+end
+
+# Template overrides:
+
 def javascripts_full_list
   %w(js/jquery.js js/full_list.js js/sketchup.js)
 end
 
+def generate_assets
+  super
+  copy('favicon.ico')
+  copy('images/SU_Developer-RedWhite.png')
+  copy('images/trimble-logo-white.png')
+end
+
 # Custom search list grouping the classes in the API into similar groups.
 # TODO(thomthom): This file is just a stub.
 

data/lib/yard-sketchup/templates/default/layout/html/embed_meta.erb

@@ -2,32 +2,32 @@
     case object
     when String
       if object == "_index.html" || object == "index.html"
-        su_page_url = "http://ruby.sketchup.com/index.html"
+        su_page_url = "https://ruby.sketchup.com/index.html"
         su_page_title = "Alphabetic Index"
         su_page_desc  = "Alphabetic Index of Files and API Namespaces. This is the main landing page for the SketchUp Ruby API Documentation."
       else
-        su_page_url = "http://ruby.sketchup.com/"+(object =~ /(.html)\z/ ? object : "#{File.basename(object,'.*')}.html" )
+        su_page_url = "https://ruby.sketchup.com/"+(object =~ /(.html)\z/ ? object : "#{File.basename(object,'.*')}.html" )
         su_page_title = (@page_title && !@page_title.empty?) ? (h @page_title) : object.split('.')[0]
         su_page_desc  = "The #{su_page_title} page."
       end
     when YARD::CodeObjects::Base # or subclass
-      if object.root? 
+      if object.root?
         if @file # Generating a YARD::CodeObjects::ExtraFileObject
-          su_page_url   = "http://ruby.sketchup.com/file.#{File.basename(@file.filename,'.*')}.html"
+          su_page_url   = "https://ruby.sketchup.com/file.#{File.basename(@file.filename,'.*')}.html"
           su_page_title = h @page_title
           su_page_desc  = @file.title
         elsif h @page_title == "Top Level Namespace"
-          su_page_url   = "http://ruby.sketchup.com/top-level-namespace.html"
+          su_page_url   = "https://ruby.sketchup.com/top-level-namespace.html"
           su_page_title = h @page_title
           su_page_desc  = "The Top Level Namespace for Ruby and the SketchUp API, listing global constants, and a summary of toplevel modules and classes."
         else %>
       <!-- <%= "YARD Error - (embed_meta.erb) Unknown root object - using site name." %>--><%
           su_page_title = su_site_name
-          su_page_url   = "http://ruby.sketchup.com/"
+          su_page_url   = "https://ruby.sketchup.com/"
           su_page_desc  = "#{su_site_name}."
         end
       else # Generating a Class or Module page:
-        su_page_url   = "http://ruby.sketchup.com/#{@path.gsub('::','/')}.html"
+        su_page_url   = "https://ruby.sketchup.com/#{@path.gsub('::','/')}.html"
         su_page_title = h @page_title
         if object.docstring.blank?
           if object.is_a?(YARD::CodeObjects::ClassObject)
@@ -45,7 +45,7 @@
     else # object is unexpected type %>
       <!-- <%= "YARD Error - (embed_meta.erb) Unexpected type: #{object.class.name}" %>--><%
       su_page_title = su_site_name
-      su_page_url   = "http://ruby.sketchup.com/"
+      su_page_url   = "https://ruby.sketchup.com/"
       if object.respond_to?(:docstring)
         su_page_desc = object.docstring.summary.gsub(/[{}+]/,'')
       else
@@ -75,4 +75,4 @@
     <meta name="twitter:title" content="<%= su_page_title %>" />
     <meta name="twitter:description" content="<%= su_page_desc %>" />
     <meta name="twitter:image:src"   content="<%= su_page_img %>?s=120" />
-    <meta name="twitter:url"   content="<%= su_page_url %>" />
+    <meta name="twitter:url"   content="<%= su_page_url %>" />

data/lib/yard-sketchup/templates/default/layout/html/footer.erb

@@ -1,4 +1,4 @@
 <div id="footer">
   Generated by
-  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
 </div>

data/lib/yard-sketchup/templates/default/layout/html/headers.erb

@@ -3,7 +3,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <!-- AUTHOR and GENERATOR -->
     <meta name="author" content="SketchUp Extensibility Team">
-    <meta name="generator" content="YARD http://yardoc.org">
+    <meta name="generator" content="YARD https://yardoc.org">
   <!-- TITLE -->
     <title><% if object == "_index.html" || object == "index.html" %>
     Alphabetic Index &mdash; <%= h options.title %><% else %>
@@ -11,5 +11,5 @@
     </title>
   <!-- SHORTCUT ICON -->
     <link rel="shortcut icon" type="image/vnd.microsoft.icon"
-    href="https://developer.sketchup.com/sites/all/themes/sketch_help/favicon.ico" />
-<%= erb(:embed_meta) %>
+    href="https://ruby.sketchup.com/favicon.ico" />
+<%= erb(:embed_meta) %>

data/lib/yard-sketchup/templates/default/layout/html/navbar.erb

@@ -2,8 +2,8 @@
 <header id="navbar" role="banner" class="navbar navbar-fixed-top navbar-inverse">
     <div id="api-documentation-header">
         <div class="navbar-header">
-            <a class="logo navbar-btn pull-left" href="http://developer.sketchup.com" title="Home">
-                <img src="https://www.sketchup.com/sites/www.sketchup.com/files/ruby/SU_Developer-RedWhite.png" alt="Home">
+            <a class="logo navbar-btn pull-left" href="https://developer.sketchup.com" title="Home">
+                <img src="https://ruby.sketchup.com/images/SU_Developer-RedWhite.png" alt="Home">
             </a>
             <a class="name navbar-brand" href="/en" title="Home">SketchUp Developer Center</a>
             <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
@@ -17,15 +17,15 @@
         <div class="navbar-collapse collapse">
             <nav role="navigation">
                 <ul class="menu nav navbar-nav">
-                    <li class="first leaf"><a href="http://forums.sketchup.com/c/developers">Community</a></li>
-                    <li class="leaf"><a href="http://blog.sketchup.com/tags/developers">SketchUpdate Blog</a></li>
-                    <li class="leaf"><a href="http://www.sketchup.com/download" class="top-menu--download-button">Download</a></li>
+                    <li class="first leaf"><a href="https://forums.sketchup.com/c/developers">Community</a></li>
+                    <li class="leaf"><a href="https://blog.sketchup.com/">SketchUp Blog</a></li>
+                    <li class="leaf"><a href="https://www.sketchup.com/download" class="top-menu--download-button">Download</a></li>
                     <li class="last expanded dropdown">
-                        <a href="http://www.trimble.com" class="trimble-top-menu-item dropdown-toggle" data-target="#" data-toggle="dropdown"><img src="https://www.sketchup.com/sites/www.sketchup.com/files/ruby/trimble-logo-white.png"><span class="caret"></span></a>
+                        <a href="https://www.trimble.com" class="trimble-top-menu-item dropdown-toggle" data-target="#" data-toggle="dropdown"><img src="https://ruby.sketchup.com/images/trimble-logo-white.png"><span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li class="first leaf"><a href="http://connect.trimble.com/">Trimble Connect</a></li>
+                            <li class="first leaf"><a href="https://connect.trimble.com/">Trimble Connect</a></li>
                             <li class="leaf"><a href="https://www.trimble.com/Corporate/About_Trimble.aspx">About Trimble</a></li>
-                            <li class="last leaf"><a href="http://buildings.trimble.com/">Trimble Buildings</a></li>
+                            <li class="last leaf"><a href="https://buildings.trimble.com/">Trimble Buildings</a></li>
                         </ul>
                     </li>
                 </ul>

data/lib/yard-sketchup/templates/rubocop-changelog/fulldoc/text/setup.rb

@@ -1,75 +1,75 @@
-require 'fileutils'
-require 'set'
-require 'stringio'
-
-include Helpers::ModuleHelper
-
-def init
-  generate_changelog
-end
-
-
-def all_objects
-  run_verifier(Registry.all())
-end
-
-def namespace_objects
-  run_verifier(Registry.all(:class, :module))
-end
-
-
-def changelog_filename
-  'Changelog SU201x.log'
-end
-
-VERSION_MATCH = /^\D+([0-9.]+)(?:\s+M(\d+))?$/
-
-def generate_changelog
-  output = StringIO.new
-
-  versions = Hash.new
-  all_objects.each { |object|
-    version_tag = object.tag(:version)
-    next if version_tag.nil?
-    version = version_tag.text
-
-    # Don't list SU6 or older.
-    next if version.match(VERSION_MATCH).captures[0].to_i <= 6
-
-    versions[version] ||= {}
-    versions[version][object.type] ||= []
-    versions[version][object.type] << object.path
-  }
-  versions = versions.sort { |a, b|
-    v1, mv1 = a[0].match(VERSION_MATCH).captures
-    v2, mv2 = b[0].match(VERSION_MATCH).captures
-    if v1 == v2
-      (mv2 || '0').to_i <=> (mv1 || '0').to_i
-    else
-      v2.to_f <=> v1.to_f
-    end
-  }
-
-  output.puts "FEATURES = ["
-  versions.each { |version, features|
-    output.puts ""
-    output.puts "  {"
-    output.puts "    version: '#{version}',"
-    output.puts "    types: {"
-    features.sort.each { |type, objects|
-      unless objects.empty?
-        output.puts "      #{type}: ["
-        objects.sort.each { |object|
-          output.puts "        '#{object}',"
-        }
-        output.puts "      ],"
-      end
-    }
-    output.puts "    },"
-    output.puts "  },"
-  }
-  output.puts "]"
-
-  puts output.string
-  exit # Avoid the YARD summary
-end
+require 'fileutils'
+require 'set'
+require 'stringio'
+
+include Helpers::ModuleHelper
+
+def init
+  generate_changelog
+end
+
+
+def all_objects
+  run_verifier(Registry.all())
+end
+
+def namespace_objects
+  run_verifier(Registry.all(:class, :module))
+end
+
+
+def changelog_filename
+  'Changelog SU201x.log'
+end
+
+VERSION_MATCH = /^\D+([0-9.]+)(?:\s+M(\d+))?$/
+
+def generate_changelog
+  output = StringIO.new
+
+  versions = Hash.new
+  all_objects.each { |object|
+    version_tag = object.tag(:version)
+    next if version_tag.nil?
+    version = version_tag.text
+
+    # Don't list SU6 or older.
+    next if version.match(VERSION_MATCH).captures[0].to_i <= 6
+
+    versions[version] ||= {}
+    versions[version][object.type] ||= []
+    versions[version][object.type] << object.path
+  }
+  versions = versions.sort { |a, b|
+    v1, mv1 = a[0].match(VERSION_MATCH).captures
+    v2, mv2 = b[0].match(VERSION_MATCH).captures
+    if v1 == v2
+      (mv2 || '0').to_i <=> (mv1 || '0').to_i
+    else
+      v2.to_f <=> v1.to_f
+    end
+  }
+
+  output.puts "FEATURES = ["
+  versions.each { |version, features|
+    output.puts ""
+    output.puts "  {"
+    output.puts "    version: '#{version}',"
+    output.puts "    types: {"
+    features.sort.each { |type, objects|
+      unless objects.empty?
+        output.puts "      #{type}: ["
+        objects.sort.each { |object|
+          output.puts "        '#{object}',"
+        }
+        output.puts "      ],"
+      end
+    }
+    output.puts "    },"
+    output.puts "  },"
+  }
+  output.puts "]"
+
+  puts output.string
+  exit # Avoid the YARD summary
+end

data/lib/yard-sketchup/templates/stubs/fulldoc/text/setup.rb

@@ -17,31 +17,21 @@ def namespace_objects
   run_verifier(Registry.all(:class, :module))
 end
 
-
-def generate_autoload
-  generate_sketchup_autoload
-end
-
-def generate_sketchup_autoload
-  base = Pathname.new(autoload_stubs_path)
-  autoload_file = File.join(autoload_stubs_path, 'sketchup.rb')
-  File.open(autoload_file, 'w') { |file|
-    pattern = File.join(sketchup_stubs_path, '**/*.rb')
-    Dir.glob(pattern) { |filename|
-      pathname = Pathname.new(filename)
-      relative = pathname.relative_path_from(base)
-      file.puts "require '#{relative.to_s}'"
-    }
-  }
-end
-
 def generate_stubs
   puts "Generating stubs..."
   generate_module_stubs(Registry.root)
   namespace_objects.each do |object|
     generate_module_stubs(object)
   end
-  generate_autoload
+  generate_autoloader(namespace_objects)
+end
+
+def generate_autoloader(namespace_objects)
+  generator = SketchUpYARD::Stubs::AutoLoadGenerator.new
+  autoload_file = File.join(stubs_gem_path, 'sketchup.rb')
+  File.open(autoload_file, 'w') do |file|
+    generator.generate(namespace_objects, file)
+  end
 end
 
 def print_section(io, title, content)
@@ -101,22 +91,34 @@ def output_path
   options.serializer.options[:basepath] || File.join(Dir.pwd, 'stubs')
 end
 
-def stubs_path
+def stubs_root_path
   ensure_exist(output_path)
 end
 
-def autoload_stubs_path
-  ensure_exist(File.join(stubs_path, 'autoload'))
+def stubs_lib_path
+  ensure_exist(File.join(stubs_root_path, 'lib'))
 end
 
-def sketchup_stubs_path
-  ensure_exist(File.join(stubs_path, 'SketchUp'))
+def stubs_gem_path
+  ensure_exist(File.join(stubs_lib_path, 'sketchup-api-stubs'))
+end
+
+def stubs_path
+  ensure_exist(File.join(stubs_gem_path, 'stubs'))
 end
 
 def stub_filename(object)
   basename = object.path.gsub('::', '/')
   basename = '_top_level' if basename.empty?
-  File.join(sketchup_stubs_path, "#{basename}.rb")
+  File.join(stubs_path, "#{basename}.rb")
+end
+
+# A stable sort_by method.
+#
+# @param [Enumerable]
+# @return [Array]
+def stable_sort_by(list)
+  list.each_with_index.sort_by { |item, i| [yield(item), i] }.map(&:first)
 end
 
 CAMELCASE_CONSTANT = /^([A-Z]+[a-z]+)/
@@ -150,9 +152,7 @@ def generate_constants_grouped(object)
   grouped_output = groups.map { |group, group_constants|
     output = StringIO.new
     # Each group itself is sorted in order to more easily scan the list.
-    sorted = group_constants.sort { |a, b|
-      a.name <=> b.name
-    }
+    sorted = stable_sort_by(group_constants, &:name)
     sorted.each { |constant|
       output.puts "  #{constant.name} = nil # Stub value."
     }
@@ -160,17 +160,14 @@ def generate_constants_grouped(object)
   }
   # Finally each group is also sorted, again to ease scanning for a particular
   # name. We simply use the first character of each group.
-  grouped_output.sort { |a, b|
-    a.lstrip[0] <=> b.lstrip[0]
-  }.join("\n")
+  stable_sort_by(grouped_output) { |item| item.lstrip[0] }.join("\n")
 end
 
 # Sort constants without grouping.
 def generate_constants(object)
   output = StringIO.new
-  constants = run_verifier(object.constants(object_options)).sort { |a, b|
-    a.name <=> b.name
-  }
+  constants = run_verifier(object.constants(object_options))
+  constants = stable_sort_by(constants, &:name) 
   constants.each { |constant|
     output.puts "  #{constant.name} = nil # Stub value."
   }
@@ -180,9 +177,8 @@ end
 def generate_mixins(object, scope)
   output = StringIO.new
   mixin_type = (scope == :class) ? 'extend' : 'include'
-  mixins = run_verifier(object.mixins(scope)).sort { |a, b|
-    a.path <=> b.path
-  }
+  mixins = run_verifier(object.mixins(scope))
+  mixins = stable_sort_by(mixins, &:path)
   mixins.each { |mixin|
     output.puts "  #{mixin_type} #{mixin.path}"
   }
@@ -261,9 +257,7 @@ def sort_methods(object, scope)
   objects = methods.select { |method|
     method.scope == scope
   }
-  objects.sort { |a, b|
-    a.name <=> b.name
-  }
+  stable_sort_by(objects, &:name)
 end
 
 def object_options

data/lib/yard-sketchup/version.rb

@@ -1,3 +1,3 @@
 module SketchUpYARD
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/lib/yard-sketchup/yard/handlers/class_constants.rb

@@ -1,17 +1,17 @@
-module SketchUpYARD
-  class ClassConstantHandler < YARD::Handlers::C::Base
-
-    MATCH = %r{\bDEFINE_RUBY_CLASS_CONSTANT\s*\(([^,]+)\s*,\s*([^,]+)\s*,\s*(\w+)\s*\)\s*;}xm
-    handles MATCH
-    statement_class BodyStatement
-
-    process do
-      statement.source.scan(MATCH) do |klass_name, value, const_name|
-        type = "const"
-        value = "nil"
-        handle_constants(type, klass_name, const_name, value)
-      end
-    end
-
-  end
-end
+module SketchUpYARD
+  class ClassConstantHandler < YARD::Handlers::C::Base
+
+    MATCH = %r{\bDEFINE_RUBY_CLASS_CONSTANT\s*\(([^,]+)\s*,\s*([^,]+)\s*,\s*(\w+)\s*\)\s*;}xm
+    handles MATCH
+    statement_class BodyStatement
+
+    process do
+      statement.source.scan(MATCH) do |klass_name, value, const_name|
+        type = "const"
+        value = "nil"
+        handle_constants(type, klass_name, const_name, value)
+      end
+    end
+
+  end
+end

data/lib/yard-sketchup/yard/handlers/class_enum_constants.rb

@@ -1,17 +1,17 @@
-module SketchUpYARD
-  class ClassEnumConstantHandler < YARD::Handlers::C::Base
-
-    MATCH = %r{\bDEFINE_RUBY_CLASS_ENUM\s*\(([^,]+)\s*,\s*(\w+)\s*\)\s*;}xm
-    handles MATCH
-    statement_class BodyStatement
-
-    process do
-      statement.source.scan(MATCH) do |klass_name, const_name|
-        type = "const"
-        value = "nil"
-        handle_constants(type, klass_name, const_name, value)
-      end
-    end
-
-  end
-end
+module SketchUpYARD
+  class ClassEnumConstantHandler < YARD::Handlers::C::Base
+
+    MATCH = %r{\bDEFINE_RUBY_CLASS_ENUM\s*\(([^,]+)\s*,\s*(\w+)\s*\)\s*;}xm
+    handles MATCH
+    statement_class BodyStatement
+
+    process do
+      statement.source.scan(MATCH) do |klass_name, const_name|
+        type = "const"
+        value = "nil"
+        handle_constants(type, klass_name, const_name, value)
+      end
+    end
+
+  end
+end

data/lib/yard-sketchup/yard/handlers/global_constants.rb

@@ -1,19 +1,19 @@
-module SketchUpYARD
-  class GlobalConstantHandler < YARD::Handlers::C::Base
-
-    MATCH = %r{\bDEFINE_RUBY_(?:(?:NAMED_)?CONSTANT|ENUM)\s*\((?:[^)]+,\s*)?(\w+)\)\s*;}xm
-    handles MATCH
-    statement_class BodyStatement
-
-    process do
-      statement.source.scan(MATCH) do |captures|
-        const_name = captures.first
-        type = "global_const"
-        var_name = nil
-        value = "nil"
-        handle_constants(type, var_name, const_name, value)
-      end
-    end
-
-  end
-end
+module SketchUpYARD
+  class GlobalConstantHandler < YARD::Handlers::C::Base
+
+    MATCH = %r{\bDEFINE_RUBY_(?:(?:NAMED_)?CONSTANT|ENUM)\s*\((?:[^)]+,\s*)?(\w+)\)\s*;}xm
+    handles MATCH
+    statement_class BodyStatement
+
+    process do
+      statement.source.scan(MATCH) do |captures|
+        const_name = captures.first
+        type = "global_const"
+        var_name = nil
+        value = "nil"
+        handle_constants(type, var_name, const_name, value)
+      end
+    end
+
+  end
+end

data/lib/yard-sketchup/yard/logger.rb

@@ -1,45 +1,45 @@
-require 'yard/logging'
-
-# Hack to show some progress on Windows while building the docs.
-# Helpful in seeing what takes most time.
-# It's Copy+Paste from YARD 0.9.9 with some noted edits.
-module YARD
-  class Logger < ::Logger
-
-    def show_progress
-      return false if YARD.ruby18? # threading is too ineffective for progress support
-      # <hack>
-      # return false if YARD.windows? # windows has poor ANSI support
-      # </hack>
-      return false unless io.tty? # no TTY support on IO
-      return false unless level > INFO # no progress in verbose/debug modes
-      @show_progress
-    end
-
-    def progress(msg, nontty_log = :debug)
-      send(nontty_log, msg) if nontty_log
-      return unless show_progress
-      icon = ""
-      if defined?(::Encoding)
-        icon = PROGRESS_INDICATORS[@progress_indicator] + " "
-      end
-      @mutex.synchronize do
-        print("\e[2K\e[?25l\e[1m#{icon}#{msg}\e[0m\r")
-        @progress_msg = msg
-        if Time.now - @progress_last_update > 0.2
-          @progress_indicator += 1
-          @progress_indicator %= PROGRESS_INDICATORS.size
-          @progress_last_update = Time.now
-        end
-      end
-      Thread.new do
-        sleep(0.05)
-        # <hack>
-        # progress(msg + ".", nil) if @progress_msg == msg
-        # </hack>
-        progress(msg, nil) if @progress_msg == msg
-      end
-    end
-
-  end
-end if true # Set to false to disable hack.
+require 'yard/logging'
+
+# Hack to show some progress on Windows while building the docs.
+# Helpful in seeing what takes most time.
+# It's Copy+Paste from YARD 0.9.9 with some noted edits.
+module YARD
+  class Logger < ::Logger
+
+    def show_progress
+      return false if YARD.ruby18? # threading is too ineffective for progress support
+      # <hack>
+      # return false if YARD.windows? # windows has poor ANSI support
+      # </hack>
+      return false unless io.tty? # no TTY support on IO
+      return false unless level > INFO # no progress in verbose/debug modes
+      @show_progress
+    end
+
+    def progress(msg, nontty_log = :debug)
+      send(nontty_log, msg) if nontty_log
+      return unless show_progress
+      icon = ""
+      if defined?(::Encoding)
+        icon = PROGRESS_INDICATORS[@progress_indicator] + " "
+      end
+      @mutex.synchronize do
+        print("\e[2K\e[?25l\e[1m#{icon}#{msg}\e[0m\r")
+        @progress_msg = msg
+        if Time.now - @progress_last_update > 0.2
+          @progress_indicator += 1
+          @progress_indicator %= PROGRESS_INDICATORS.size
+          @progress_last_update = Time.now
+        end
+      end
+      Thread.new do
+        sleep(0.05)
+        # <hack>
+        # progress(msg + ".", nil) if @progress_msg == msg
+        # </hack>
+        progress(msg, nil) if @progress_msg == msg
+      end
+    end
+
+  end
+end if true # Set to false to disable hack.

data/yard-sketchup.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   ]
 
   spec.add_dependency 'yard', '~> 0.9.18'
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler', '>= 1.15.0', '< 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard-sketchup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Trimble Inc, SketchUp Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -28,16 +28,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.0'
 description: SketchUp Ruby API YARD template.
 email: 
 executables: []
@@ -46,11 +52,16 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - lib/yard-sketchup.rb
+- lib/yard-sketchup/patches/c_base_handler.rb
+- lib/yard-sketchup/stubs/autoload.rb
 - lib/yard-sketchup/templates/changelog/fulldoc/text/setup.rb
 - lib/yard-sketchup/templates/coverage/fulldoc/text/setup.rb
 - lib/yard-sketchup/templates/default/fulldoc/html/css/rubyapi.css
 - lib/yard-sketchup/templates/default/fulldoc/html/css/sketchup.css
+- lib/yard-sketchup/templates/default/fulldoc/html/favicon.ico
 - lib/yard-sketchup/templates/default/fulldoc/html/full_list_object_types.erb
+- lib/yard-sketchup/templates/default/fulldoc/html/images/SU_Developer-RedWhite.png
+- lib/yard-sketchup/templates/default/fulldoc/html/images/trimble-logo-white.png
 - lib/yard-sketchup/templates/default/fulldoc/html/js/sketchup.js
 - lib/yard-sketchup/templates/default/fulldoc/html/setup.rb
 - lib/yard-sketchup/templates/default/layout/html/embed_meta.erb