email_address 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af93d7667f03ada0b8a4a533e6adf19416079db72e1e152fd96fa1e851da0b27
-  data.tar.gz: '06938a36efdfe7dc827e7f210e71f5d44431763a8d35b650aa6d39b69f280790'
+  metadata.gz: 46541e8de9140acd70cc23c1f60515c077ea919e0b04444a83d681e19fcbd4e1
+  data.tar.gz: 34f52f8bfa70a33d8e40c5986d1c9d4a49956a4c12d6bc69df8037705f76c417
 SHA512:
-  metadata.gz: 98c07c4589f2bd1ada9ef41f0aa7c5069ddaf60ce721e7e07a0384c8a535686ad32b6d574128122c3fec866072cbc8dad105e11eca14c075d2cd2c655daacb06
-  data.tar.gz: 79677817c08933c78fb0d25b631568e894c2d0c7fb9e20f7c71a871d4f8f7a698722d962887017705b4423be8f569d20632f0b60bb333ec7a77592d82c7a8c26
+  metadata.gz: adde7e6139b151e6759861a0b7054c7f179a7f590d8180141c31b786ebba81aba2d01657c4073158779e879ec27b3c76389679131061661dae46cf1f1c315b92
+  data.tar.gz: 3420904e9bbe4713bf6e57e7bd6d1d059c7616f529a650c07828c9e45eb1a1ce3566412d86358b8c04c335ad49f55aed1f5e715d08a7eb8e4e066a703231f28e

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
   - 2.7.0
-  - 2.3.7
+  - 2.3.0
   - jruby-9.2.9.0
-  #- rbx
 
 addons:
   code_climate:

data/email_address.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/afair/email_address"
   spec.license       = "MIT"
 
+  #spec.required_ruby_version = ">= 2.3.0"
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/lib/email_address/address.rb

@@ -23,14 +23,13 @@ module EmailAddress
     # instance, and initializes the address to the "normalized" format of the
     # address. The original string is available in the #original method.
     def initialize(email_address, config = {})
-      @config = config # This needs refactoring!
+      @config = EmailAddress::Config.new(config)
       @original = email_address
       email_address = (email_address || "").strip
       email_address = parse_rewritten(email_address) unless config[:skip_rewrite]
       local, host = EmailAddress::Address.split_local_host(email_address)
 
-      @host = EmailAddress::Host.new(host, config)
-      @config = @host.config
+      @host = EmailAddress::Host.new(host, @config)
       @local = EmailAddress::Local.new(local, @config, @host)
       @error = @error_message = nil
     end

data/lib/email_address/config.rb

@@ -175,8 +175,7 @@ module EmailAddress
     def self.provider(name, config = {})
       name = name.to_sym
       if config.size > 0
-        @providers[name] ||= @config.clone
-        @providers[name].merge!(config)
+        @providers[name.to_sym] = config
       end
       @providers[name]
     end
@@ -199,5 +198,25 @@ module EmailAddress
       configs.each { |c| config.merge!(c) }
       config
     end
+
+    def initialize(overrides = {})
+      @config = EmailAddress::Config.all_settings(overrides)
+    end
+
+    def []=(setting, value)
+      @config[setting.to_sym] = value
+    end
+
+    def [](setting)
+      @config[setting.to_sym]
+    end
+
+    def configure(settings)
+      @config = @config.merge(settings)
+    end
+
+    def to_h
+      @config
+    end
   end
 end

data/lib/email_address/exchanger.rb

@@ -24,7 +24,7 @@ module EmailAddress
 
     def initialize(host, config = {})
       @host = host
-      @config = config
+      @config = config.is_a?(Hash) ? EmailAddress::Config.new(config) : config
       @dns_disabled = @config[:host_validation] == :syntax || @config[:dns_lookup] == :off
     end
 

data/lib/email_address/host.rb

@@ -87,7 +87,7 @@ module EmailAddress
     def initialize(host_name, config = {})
       @original = host_name ||= ""
       config[:host_type] ||= :email
-      @config = config
+      @config = config.is_a?(Hash) ? EmailAddress::Config.new(config) : config
       @error = @error_message = nil
       parse(host_name)
     end
@@ -149,7 +149,7 @@ module EmailAddress
       if @config[:host_remove_spaces]
         @host_name = @host_name.delete(" ")
       end
-      @dns_name = if /[^[:ascii:]]/.match?(host_name)
+      @dns_name = if /[^[:ascii:]]/.match(host_name)
         ::SimpleIDN.to_ascii(host_name)
       else
         host_name
@@ -227,8 +227,8 @@ module EmailAddress
     end
 
     def set_provider(name, provider_config = {}) # :nodoc:
-      self.config = EmailAddress::Config.all_settings(provider_config, @config)
-      self.provider = name
+      config.configure(provider_config)
+      @provider = name
     end
 
     # Returns a hash of the parts of the host name after parsing.

data/lib/email_address/local.rb

@@ -107,7 +107,7 @@ module EmailAddress
       %r/^([\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+)$/i.freeze
 
     def initialize(local, config={}, host=nil)
-      self.config   = config.empty? ? EmailAddress::Config.all_settings : config
+      @config = config.is_a?(Hash) ? EmailAddress::Config.new(config) : config
       self.local    = local
       @host         = host
       @error        = @error_message = nil
@@ -130,10 +130,10 @@ module EmailAddress
     def parse(raw)
       if raw =~ /\A\"(.*)\"\z/ # Quoted
         raw = $1
-        raw.gsub!(/\\(.)/, '\1') # Unescape
+        raw = raw.gsub(/\\(.)/, '\1') # Unescape
       elsif @config[:local_fix] && @config[:local_format] != :standard
-        raw.gsub!(' ','')
-        raw.gsub!(',','.')
+        raw = raw.gsub(' ','')
+        raw = raw.gsub(',','.')
         #raw.gsub!(/([^\p{L}\p{N}]{2,10})/) {|s| s[0] } # Stutter punctuation typo
       end
       raw, comment = self.parse_comment(raw)
@@ -226,7 +226,7 @@ module EmailAddress
     def relax
       form = self.mailbox
       form += @config[:tag_separator] + self.tag if self.tag
-      form.gsub!(/[ \"\(\),:<>@\[\]\\]/,'')
+      form = form.gsub(/[ \"\(\),:<>@\[\]\\]/,'')
       form
     end
 
@@ -235,7 +235,7 @@ module EmailAddress
       form = self.mailbox
       form += @config[:tag_separator] + self.tag if self.tag
       form += "(" + self.comment + ")" if self.comment
-      form.gsub!(/([\\\"])/, '\\\1') # Escape \ and "
+      form = form.gsub(/([\\\"])/, '\\\1') # Escape \ and "
       if form =~ /[ \"\(\),:<>@\[\\\]]/ # Space and "(),:;<>@[\]
         form = %Q("#{form}")
       end

data/lib/email_address/version.rb

@@ -1,3 +1,3 @@
 module EmailAddress
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email_address
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Allen Fair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This gem provides a ruby language library for working with and validating