lib/watir/generator/base/generator.rb in watir-6.13.0 vs lib/watir/generator/base/generator.rb in watir-6.14.0

@@ -1,11 +1,11 @@
 module Watir
   module Generator
     class Base
-
       def generate(spec_url, io = StringIO.new)
-        @spec_url, @io = spec_url, io
+        @spec_url = spec_url
+        @io = io
 
         extract_spec
         cleanup_spec
 
         write_header
@@ -32,13 +32,11 @@
 
       def extract_spec
         @tag2interfaces    = extractor.process
         @sorted_interfaces = extractor.sorted_interfaces
 
-        if extractor.errors.any?
-          raise "error extracting spec: #{extractor.errors.join("\n")}"
-        end
+        raise "error extracting spec: #{extractor.errors.join("\n")}" if extractor.errors.any?
       end
 
       def cleanup_spec
         ignored_tags.each do |tag|
           @tag2interfaces.delete(tag)
@@ -53,27 +51,27 @@
         end
       end
 
       def write_header
         @io.puts "# Autogenerated from #{generator_implementation} specification. Edits may be lost."
-        @io.puts "module Watir"
+        @io.puts 'module Watir'
       end
 
       def write_class_defs
         @sorted_interfaces.each do |interface|
           interface = generator.generate(interface)
-          unless interface.empty?
-            interface.gsub!(/^\s+\n/, '') # remove empty lines
-            @io.puts indent(interface)
-            @io.puts "\n"
-          end
+          next if interface.empty?
+
+          interface.gsub!(/^\s+\n/, '') # remove empty lines
+          @io.puts indent(interface)
+          @io.puts "\n"
         end
       end
 
       def write_container_methods
         @io.puts "\n"
-        @io.puts indent("module Container")
+        @io.puts indent('module Container')
 
         @tag2interfaces.sort.each do |tag, interfaces|
           raise "multiple interfaces for tag #{tag.inspect}" if interfaces.map(&:name).uniq.size != 1
 
           tag_string       = tag.inspect
@@ -81,35 +79,34 @@
           plural           = singular.pluralize
           element_class    = Util.classify(visitor.classify_regexp, interfaces.first.name)
           collection_class = "#{element_class}Collection"
 
           # visitor.visit_tag(tag, interfaces.first.name) !?
-          @io.puts indent(<<-CODE, 2)
+          @io.puts indent(<<~CODE, 2)
 
-# @return [#{element_class}]
-def #{singular}(*args)
-  #{element_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
-end
-# @return [#{collection_class}]
-def #{plural}(*args)
-  #{collection_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
-end
-Watir.tag_to_class[#{tag.to_sym.inspect}] = #{element_class}
+            # @return [#{element_class}]
+            def #{singular}(*args)
+              #{element_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            end
+            # @return [#{collection_class}]
+            def #{plural}(*args)
+              #{collection_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            end
+            Watir.tag_to_class[#{tag.to_sym.inspect}] = #{element_class}
 
-CODE
+          CODE
         end
 
-        @io.puts indent("end # Container")
+        @io.puts indent('end # Container')
       end
 
       def write_footer
-        @io.puts "end # Watir"
+        @io.puts 'end # Watir'
       end
 
       def indent(code, indent = 1)
-        indent_string = "  " * indent
+        indent_string = '  ' * indent
         code.split("\n").map { |line| line.empty? ? line : indent_string + line }.join("\n")
       end
-
     end # Base
   end # Generator
 end # Watir