maxmind-geoip2 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bdd199c61f9c7116b023d420f1fb0763d05abd7711dd7be0f177113028140ff
-  data.tar.gz: 00a081df1adc640dff12ef5fb8670ac9714b9edd1ef3fa65049033a1fa9d385b
+  metadata.gz: 9c1d04d352a8344e1e8d9c232ab7713bc0b74ddaa1e4a82aec61dbbf37bfd925
+  data.tar.gz: 20bcee370b35a4e098b48b36146eb7da9674f6c271ba94744a435addbd9c5e05
 SHA512:
-  metadata.gz: 85a980183be16fa99909d42db32d295ff68a8c718cb31384aef78db8fb287a970d148d12c112fbb9c3cde0a84d396a438a9faf7c196b3e2bfadce93695ebf8e4
-  data.tar.gz: 3ef1e40dd82bbf1acf3ddb14b1d774c246c78219463a00b87bfa46c14af7b623ccdfb9af5046c3a1d0b0b8b18fbe4f575d88d28d9930f3b10913c0035326a611
+  metadata.gz: 0331f1fe319379d035bd4f8675f775bbe31f0d3747d2f9a65754523cb6718160237d5a232d54cad7cd00cdcfe5243ff0f8a39276d749948116fc974221eb3d8a
+  data.tar.gz: 1d3e2f6c9a5847671b4b86004c7407bacf25cb271674d7dd49c5217b15d20a307ba416ec19a5f04d2050925ee689a97f01ca899f2edcb611bb44c5ee1a13ba35

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.0 (2023-12-04)
+
+* `MaxMind::GeoIP2::Client` now validates the IP address before making a
+  request to the web service.
+* `MaxMind::GeoIP2::Client` now includes the version of Ruby, the version
+  of the HTTP client library, and its own version in the User-Agent header.
+* The `anycast?` method was added to `MaxMind::GeoIP2::Record::Traits`.
+  This returns `true` if the IP address belongs to an [anycast
+  network](https://en.wikipedia.org/wiki/Anycast). This is available for
+  the GeoIP2 Country, City Plus, and Insights web services and the GeoIP2
+  Country, City, and Enterprise databases.
+
 ## 1.1.0 (2021-11-18)
 
 * Exceptions from this gem now inherit from `MaxMind::GeoIP2::Error`. IP

data/README.md

@@ -228,14 +228,19 @@ client = MaxMind::GeoIP2::Client.new(
   account_id: 42,
   license_key: 'license_key',
 
-  # To use the GeoLite2 web service instead of GeoIP2 Precision, set
+  # To use the GeoLite2 web service instead of the GeoIP2 web service, set
   # the host parameter to "geolite.info":
   # host: 'geolite.info',
+
+  # To use the Sandbox GeoIP2 web service instead of the production GeoIP2
+  # web service, set the host parameter to "sandbox.maxmind.com":
+  # host: 'sandbox.maxmind.com',
 )
 
 # Replace "city" with the method corresponding to the web service that
 # you are using, e.g., "country", "insights". Please note that Insights
-# is only supported by GeoIP2 Precision and not the GeoLite2 web service.
+# is only supported by the GeoIP2 web service and not the GeoLite2 web
+# service.
 record = client.city('128.101.101.101')
 
 puts record.country.iso_code # US
@@ -279,8 +284,8 @@ which can be populated vary between end points. In addition, while an end
 point may offer a particular piece of data, MaxMind does not always have
 every piece of data for any given IP address.
 
-See the [GeoIP2 Precision web service
-docs](https://dev.maxmind.com/geoip/docs/web-services?lang=en) for details on
+See the [GeoIP2 web service
+documentation](https://dev.maxmind.com/geoip/docs/web-services?lang=en) for details on
 what data each end point may return.
 
 The only piece of data which is always returned is the `ip_address`
@@ -340,7 +345,7 @@ This library uses [Semantic Versioning](https://semver.org/).
 
 ## Copyright and License
 
-This software is Copyright (c) 2020-2021 by MaxMind, Inc.
+This software is Copyright (c) 2020-2023 by MaxMind, Inc.
 
 This is free software, licensed under the [Apache License, Version
 2.0](LICENSE-APACHE) or the [MIT License](LICENSE-MIT), at your option.

data/lib/maxmind/geoip2/client.rb

@@ -4,15 +4,17 @@ require 'connection_pool'
 require 'http'
 require 'json'
 require 'maxmind/geoip2/errors'
+require 'maxmind/geoip2/version'
 require 'maxmind/geoip2/model/city'
 require 'maxmind/geoip2/model/country'
 require 'maxmind/geoip2/model/insights'
+require 'resolv'
 
 module MaxMind
   module GeoIP2
     # This class provides a client API for all the
-    # {https://dev.maxmind.com/geoip/docs/web-services?lang=en GeoIP2 Precision web
-    # services}. The services are Country, City, and Insights. Each service
+    # {https://dev.maxmind.com/geoip/docs/web-services?lang=en GeoIP2 web
+    # services}. The services are Country, City Plus, and Insights. Each service
     # returns a different set of data about an IP address, with Country returning
     # the least data and Insights the most.
     #
@@ -58,7 +60,7 @@ module MaxMind
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
 
-      # Create a Client that may be used to query a GeoIP2 Precision web service.
+      # Create a Client that may be used to query a GeoIP2 web service.
       #
       # Once created, the Client is safe to use for lookups from multiple
       # threads.
@@ -71,8 +73,10 @@ module MaxMind
       #   property from most preferred to least preferred.
       #
       # @param host [String] the host to use when querying the web service. Set
-      #   this to "geolite.info" to use the GeoLite2 web service instead of
-      #   GeoIP2 Precision.
+      #   this to "geolite.info" to use the GeoLite2 web service instead of the
+      #   GeoIP2 web service. Set this to "sandbox.maxmind.com" to use the
+      #   Sandbox environment. The sandbox allows you to experiment with the
+      #   API without affecting your production data.
       #
       # @param timeout [Integer] the number of seconds to wait for a request
       #   before timing out. If 0, no timeout is set.
@@ -117,7 +121,7 @@ module MaxMind
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/ParameterLists
 
-      # This method calls the City web service.
+      # This method calls the City Plus web service.
       #
       # @param ip_address [String] IPv4 or IPv6 address as a string. If no
       #   address is provided, the address that the web service is called from is
@@ -193,8 +197,8 @@ module MaxMind
 
       # This method calls the Insights web service.
       #
-      # Insights is only supported by the GeoIP2 Precision web service. The
-      # GeoLite2 web service does not support it.
+      # Insights is only supported by the GeoIP2 web service. The GeoLite2 web
+      # service does not support it.
       #
       # @param ip_address [String] IPv4 or IPv6 address as a string. If no
       #   address is provided, the address that the web service is called from is
@@ -234,6 +238,10 @@ module MaxMind
       private
 
       def response_for(endpoint, model_class, ip_address)
+        if ip_address != 'me' && ip_address !~ Resolv::AddressRegex
+          raise AddressInvalidError, "The value \"#{ip_address}\" is not a valid IP address"
+        end
+
         record = get(endpoint, ip_address)
 
         model_class.new(record, @locales)
@@ -243,8 +251,9 @@ module MaxMind
         headers = HTTP.basic_auth(user: @account_id, pass: @license_key)
                       .headers(
                         accept: 'application/json',
-                        user_agent: 'MaxMind-GeoIP2-ruby',
+                        user_agent: "MaxMind-GeoIP2-ruby/#{VERSION} ruby/#{RUBY_VERSION} http/#{HTTP::VERSION}"
                       )
+
         timeout = @timeout > 0 ? headers.timeout(@timeout) : headers
 
         proxy = timeout

data/lib/maxmind/geoip2/model/city.rb

@@ -9,12 +9,11 @@ require 'maxmind/geoip2/record/subdivision'
 module MaxMind
   module GeoIP2
     module Model
-      # Model class for the data returned by the GeoIP2 City web service and
-      # database. It is also used for GeoLite2 City lookups.
+      # Model class for the data returned by the GeoIP2 City Plus web service
+      # and the City database. It is also used for GeoLite2 City lookups.
       #
-      # The only difference between the City and Insights model classes is which
-      # fields in each record may be populated. See
-      # https://dev.maxmind.com/geoip/docs/web-services?lang=en for more details.
+      # See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more
+      # details.
       #
       # See {MaxMind::GeoIP2::Model::Country} for inherited methods.
       class City < Country

data/lib/maxmind/geoip2/model/connection_type.rb

@@ -7,8 +7,9 @@ module MaxMind
     module Model
       # Model class for the GeoIP2 Connection Type database.
       class ConnectionType < Abstract
-        # The connection type may take the following values: "Dialup", "Cable/DSL",
-        # "Corporate", "Cellular". Additional values may be added in the future.
+        # The connection type may take the following values: "Dialup",
+        # "Cable/DSL", "Corporate", "Cellular", and "Satellite". Additional
+        # values may be added in the future.
         #
         # @return [String, nil]
         def connection_type

data/lib/maxmind/geoip2/model/enterprise.rb

@@ -7,9 +7,8 @@ module MaxMind
     module Model
       # Model class for the data returned by GeoIP2 Enterprise database lookups.
       #
-      # The only difference between the City and Insights model classes is which
-      # fields in each record may be populated. See
-      # https://dev.maxmind.com/geoip/docs/web-services?lang=en for more details.
+      # See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more
+      # details.
       #
       # See {MaxMind::GeoIP2::Model::City} for inherited methods.
       class Enterprise < City

data/lib/maxmind/geoip2/model/insights.rb

@@ -5,12 +5,10 @@ require 'maxmind/geoip2/model/city'
 module MaxMind
   module GeoIP2
     module Model
-      # Model class for the data returned by the GeoIP2 Precision Insights web
-      # service.
+      # Model class for the data returned by the GeoIP2 Insights web service.
       #
-      # The only difference between the City and Insights model classes is which
-      # fields in each record may be populated. See
-      # https://dev.maxmind.com/geoip/docs/web-services?lang=en for more details.
+      # See https://dev.maxmind.com/geoip/docs/web-services?lang=en for more
+      # details.
       class Insights < City
       end
     end

data/lib/maxmind/geoip2/record/traits.rb

@@ -22,8 +22,8 @@ module MaxMind
 
         # The autonomous system number associated with the IP address. See
         # Wikipedia[https://en.wikipedia.org/wiki/Autonomous_system_(Internet)].
-        # This attribute is only available from the City and Insights web service
-        # and the GeoIP2 Enterprise database.
+        # This attribute is only available from the City Plus and Insights web
+        # services and the Enterprise database.
         #
         # @return [Integer, nil]
         def autonomous_system_number
@@ -33,8 +33,8 @@ module MaxMind
         # The organization associated with the registered autonomous system number
         # for the IP address. See
         # Wikipedia[https://en.wikipedia.org/wiki/Autonomous_system_(Internet)].
-        # This attribute is only available from the City and Insights web service
-        # and the GeoIP2 Enterprise database.
+        # This attribute is only available from the City Plus and Insights web
+        # services and the Enterprise database.
         #
         # @return [String, nil]
         def autonomous_system_organization
@@ -42,8 +42,9 @@ module MaxMind
         end
 
         # The connection type may take the following  values: "Dialup",
-        # "Cable/DSL", "Corporate", "Cellular". Additional values may be added in
-        # the future. This attribute is only available in the GeoIP2 Enterprise
+        # "Cable/DSL", "Corporate", "Cellular", and "Satellite". Additional
+        # values may be added in the future. This attribute is only available
+        # from the City Plus and Insights web services and the Enterprise
         # database.
         #
         # @return [String, nil]
@@ -53,8 +54,8 @@ module MaxMind
 
         # The second level domain associated with the IP address. This will be
         # something like "example.com" or "example.co.uk", not "foo.example.com".
-        # This attribute is only available from the City and Insights web service
-        # and the GeoIP2 Enterprise database.
+        # This attribute is only available from the City Plus and Insights web
+        # services and the Enterprise database.
         #
         # @return [String, nil]
         def domain
@@ -73,7 +74,7 @@ module MaxMind
         end
 
         # This is true if the IP address belongs to any sort of anonymous network.
-        # This property is only available from GeoIP2 Precision Insights.
+        # This property is only available from Insights.
         #
         # @return [Boolean]
         def anonymous?
@@ -83,17 +84,28 @@ module MaxMind
         # This is true if the IP address is registered to an anonymous VPN
         # provider. If a VPN provider does not register subnets under names
         # associated with them, we will likely only flag their IP ranges using the
-        # hosting_provider? property. This property is only available from GeoIP2
-        # Precision Insights.
+        # hosting_provider? property. This property is only available from Insights.
         #
         # @return [Boolean]
         def anonymous_vpn?
           get('is_anonymous_vpn')
         end
 
+        # This is true if the IP address belongs to an
+        # {https://en.wikipedia.org/wiki/Anycast anycast network}.
+        #
+        # This property is only available from the Country, City Plus, and
+        # Insights web services and the GeoIP2 Country, City, and Enterprise
+        # databases.
+        #
+        # @return [Boolean]
+        def anycast?
+          get('is_anycast')
+        end
+
         # This is true if the IP address belongs to a hosting or VPN provider (see
         # description of the anonymous_vpn? property). This property is only
-        # available from GeoIP2 Precision Insights.
+        # available from Insights.
         #
         # @return [Boolean]
         def hosting_provider?
@@ -102,7 +114,7 @@ module MaxMind
 
         # This attribute is true if MaxMind believes this IP address to be a
         # legitimate proxy, such as an internal VPN used by a corporation. This
-        # attribute is only available in the GeoIP2 Enterprise database.
+        # attribute is only available in the Enterprise database.
         #
         # @return [Boolean]
         def legitimate_proxy?
@@ -112,8 +124,8 @@ module MaxMind
         # The {https://en.wikipedia.org/wiki/Mobile_country_code mobile country
         # code (MCC)} associated with the IP address and ISP.
         #
-        # This attribute is only available from the City and Insights web service
-        # and the GeoIP2 Enterprise database.
+        # This attribute is only available from the City Plus and Insights web
+        # services and the Enterprise database.
         #
         # @return [String, nil]
         def mobile_country_code
@@ -123,8 +135,8 @@ module MaxMind
         # The {https://en.wikipedia.org/wiki/Mobile_country_code mobile network
         # code (MNC)} associated with the IP address and ISP.
         #
-        # This attribute is only available from the City and Insights web service
-        # and the GeoIP2 Enterprise database.
+        # This attribute is only available from the City Plus and Insights web
+        # services and the Enterprise database.
         #
         # @return [String, nil]
         def mobile_network_code
@@ -132,7 +144,7 @@ module MaxMind
         end
 
         # This is true if the IP address belongs to a public proxy. This property
-        # is only available from GeoIP2 Precision Insights.
+        # is only available from Insights.
         #
         # @return [Boolean]
         def public_proxy?
@@ -141,7 +153,7 @@ module MaxMind
 
         # This is true if the IP address is on a suspected anonymizing network
         # and belongs to a residential ISP. This property is only available
-        # from GeoIP2 Precision Insights.
+        # from Insights.
         #
         # @return [Boolean]
         def residential_proxy?
@@ -149,7 +161,7 @@ module MaxMind
         end
 
         # This is true if the IP address is a Tor exit node. This property is only
-        # available from GeoIP2 Precision Insights.
+        # available from Insights.
         #
         # @return [Boolean]
         def tor_exit_node?
@@ -157,7 +169,7 @@ module MaxMind
         end
 
         # The name of the ISP associated with the IP address. This attribute is
-        # only available from the City and Insights web services and the GeoIP2
+        # only available from the City Plus and Insights web services and the
         # Enterprise database.
         #
         # @return [String, nil]
@@ -175,8 +187,8 @@ module MaxMind
         end
 
         # The name of the organization associated with the IP address. This
-        # attribute is only available from the City and Insights web services and
-        # the GeoIP2 Enterprise database.
+        # attribute is only available from the City Plus and Insights web services
+        # and the Enterprise database.
         #
         # @return [String, nil]
         def organization
@@ -184,7 +196,7 @@ module MaxMind
         end
 
         # An indicator of how static or dynamic an IP address is. This property is
-        # only available from GeoIP2 Precision Insights.
+        # only available from Insights.
         #
         # @return [Float, nil]
         def static_ip_score
@@ -193,8 +205,7 @@ module MaxMind
 
         # The estimated number of users sharing the IP/network during the past 24
         # hours. For IPv4, the count is for the individual IP. For IPv6, the count
-        # is for the /64 network. This property is only available from GeoIP2
-        # Precision Insights.
+        # is for the /64 network. This property is only available from Insights.
         #
         # @return [Integer, nil]
         def user_count
@@ -208,6 +219,7 @@ module MaxMind
         # * cafe
         # * cellular
         # * college
+        # * consumer_privacy_network
         # * content_delivery_network
         # * dialup
         # * government
@@ -221,7 +233,7 @@ module MaxMind
         # * traveler
         #
         # This attribute is only available from the Insights web service and the
-        # GeoIP2 Enterprise database.
+        # Enterprise database.
         #
         # @return [String, nil]
         def user_type

data/lib/maxmind/geoip2/version.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module MaxMind
+  module GeoIP2
+    # The Gem version.
+    VERSION = '1.2.0'
+  end
+end

data/maxmind-geoip2.gemspec

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'maxmind/geoip2/version'
+
 Gem::Specification.new do |s|
   s.authors     = ['William Storey']
   s.files       = Dir['**/*']
   s.name        = 'maxmind-geoip2'
   s.summary     = 'A gem for interacting with the GeoIP2 webservices and databases.'
-  s.version     = '1.1.0'
+  s.version     = MaxMind::GeoIP2::VERSION
 
   s.description = 'A gem for interacting with the GeoIP2 webservices and databases. MaxMind provides geolocation data as downloadable databases as well as through a webservice.'
   s.email = 'support@maxmind.com'
@@ -23,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'connection_pool', ['~> 2.2']
   s.add_runtime_dependency 'http', '>= 4.3', '< 6.0'
-  s.add_runtime_dependency 'maxmind-db', ['~> 1.1']
+  s.add_runtime_dependency 'maxmind-db', ['~> 1.2']
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/test/data/cmd/write-test-data/main.go

@@ -0,0 +1,68 @@
+// write-test-data generates test mmdb files.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/maxmind/MaxMind-DB/pkg/writer"
+)
+
+func main() {
+	source := flag.String("source", "", "Source data directory")
+	target := flag.String("target", "", "Destination directory for the generated mmdb files")
+
+	flag.Parse()
+
+	w, err := writer.New(*source, *target)
+	if err != nil {
+		fmt.Printf("creating writer: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteIPv4TestDB(); err != nil {
+		fmt.Printf("writing IPv4 test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteIPv6TestDB(); err != nil {
+		fmt.Printf("writing IPv6 test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteMixedIPTestDB(); err != nil {
+		fmt.Printf("writing IPv6 test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteNoIPv4TestDB(); err != nil {
+		fmt.Printf("writing no IPv4 test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteNoMapTestDB(); err != nil {
+		fmt.Printf("writing no map test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteMetadataPointersTestDB(); err != nil {
+		fmt.Printf("writing metadata pointers test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteDecoderTestDB(); err != nil {
+		fmt.Printf("writing decoder test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteDeeplyNestedStructuresTestDB(); err != nil {
+		fmt.Printf("writing decoder test databases: %+v\n", err)
+		os.Exit(1)
+	}
+
+	if err := w.WriteGeoIP2TestDB(); err != nil {
+		fmt.Printf("writing GeoIP2 test databases: %+v\n", err)
+		os.Exit(1)
+	}
+}

data/test/data/go.mod

@@ -0,0 +1,13 @@
+module github.com/maxmind/MaxMind-DB
+
+go 1.21
+
+require (
+	github.com/maxmind/mmdbwriter v1.0.0
+	go4.org/netipx v0.0.0-20230824141953-6213f710f925
+)
+
+require (
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+)

data/test/data/go.sum

@@ -0,0 +1,16 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/maxmind/mmdbwriter v1.0.0 h1:bieL4P6yaYaHvbtLSwnKtEvScUKKD6jcKaLiTM3WSMw=
+github.com/maxmind/mmdbwriter v1.0.0/go.mod h1:noBMCUtyN5PUQ4H8ikkOvGSHhzhLok51fON2hcrpKj8=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+go4.org/netipx v0.0.0-20230824141953-6213f710f925 h1:eeQDDVKFkx0g4Hyy8pHgmZaK0EqB4SD6rvKbUdN3ziQ=
+go4.org/netipx v0.0.0-20230824141953-6213f710f925/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

data/test/data/perltidyrc

@@ -1,6 +1,7 @@
 --blank-lines-before-packages=0
 --iterations=2
 --no-outdent-long-comments
+--weld-nested-containers
 -b
 -bar
 -boc
@@ -10,3 +11,8 @@
 -nolq
 -se
 -wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= &&= -= /= |= >>= ||= .= %= ^= x="
+--character-encoding=utf8
+--valign-exclusion-list="q"
+--want-trailing-commas=m
+--add-trailing-commas
+--delete-repeated-commas