improve deprecated arg handling

Author: jcupitt

lib/vips/image.rb

@@ -1632,8 +1632,8 @@ def self.generate_operation introspect
 
       method_args = introspect.method_args
       required_output = introspect.required_output
-      optional_input = introspect.optional_input
-      optional_output = introspect.optional_output
+      optional_input = introspect.doc_optional_input
+      optional_output = introspect.doc_optional_output
 
       print "# @!method "
       print "self." unless introspect.member_x
@@ -1654,8 +1654,6 @@ def self.generate_operation introspect
 
       puts "#   @param opts [Hash] Set of options"
       optional_input.each do |arg_name, details|
-        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
-
         yard_name = details[:yard_name]
         gtype = details[:gtype]
         rtype = gtype_to_ruby gtype
@@ -1664,8 +1662,6 @@ def self.generate_operation introspect
         puts "#   @option opts [#{rtype}] :#{yard_name} #{blurb}"
       end
       optional_output.each do |arg_name, details|
-        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
-
         yard_name = details[:yard_name]
         gtype = details[:gtype]
         rtype = gtype_to_ruby gtype

lib/vips/operation.rb

@@ -48,7 +48,8 @@ module Vips
   class Introspect
     attr_reader :name, :description, :flags, :args, :required_input,
       :optional_input, :required_output, :optional_output, :member_x,
-      :method_args, :vips_name, :destructive
+      :method_args, :vips_name, :destructive, :doc_optional_input, 
+      :doc_optional_output
 
     @@introspect_cache = {}
 
@@ -142,6 +143,8 @@ def add_yard_introspection name
       @flags = Vips.vips_operation_get_flags @op
       @member_x = nil
       @method_args = []
+      @doc_optional_input = {}
+      @doc_optional_output = {}
 
       @args.each do |details|
         arg_name = details[:arg_name]
@@ -164,6 +167,17 @@ def add_yard_introspection name
           end
         end
       end
+
+      # and make the arg sets to document by filtering out deprecated args 
+      @optional_input.each do |arg_name, details|
+        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
+        @doc_optional_input[details[:arg_name]] = details
+      end
+
+      @optional_output.each do |arg_name, details|
+        next if (details[:flags] & ARGUMENT_DEPRECATED) != 0
+        @doc_optional_output[details[:arg_name]] = details
+      end
     end
 
     def self.get name