lib/mail_safe/config.rb in mail_safe-0.1.0 vs lib/mail_safe/config.rb in mail_safe-0.2.0
- old
+ new
@@ -6,20 +6,36 @@
def self.is_internal_address?(address)
case internal_address_definition
when Regexp then address =~ internal_address_definition
when Proc then internal_address_definition.call(address)
- else raise InvalidConfigSettingError.new("internal_address_definition must be a Regexp or Proc, but was: #{internal_address_definition.class.to_s}")
+ else
+ return address.downcase == developer_email_address.downcase if developer_email_address
+ raise InvalidConfigSettingError.new("internal_address_definition must be a Regexp or Proc, but was: #{internal_address_definition.class.to_s}")
end
end
cattr_accessor :replacement_address
def self.get_replacement_address(original_address)
case replacement_address
when String then replacement_address
when Proc then replacement_address.call(original_address)
- else raise InvalidConfigSettingError.new("replacement_address must be a String or Proc, but was: #{replacement_address.class.to_s}")
+ else
+ return developer_email_address if developer_email_address
+ raise InvalidConfigSettingError.new("replacement_address must be a String or Proc, but was: #{replacement_address.class.to_s}")
end
+ end
+
+ def self.developer_email_address
+ unless defined?(@@developer_email_address)
+ @@developer_email_address = begin
+ `git config user.email`.chomp
+ rescue
+ nil
+ end
+ end
+
+ @@developer_email_address
end
end
end
\ No newline at end of file