maildotyml 0.0.2 → 0.0.3

data/README.md

@@ -35,22 +35,34 @@ test:
 
 production:
   adapter: :smtp
-  address: 'your.smtp.server'
+  # Note that some standard activerecord options are automatically translated.
+  host: 'your.smtp.server'
   port: 25
   authentication: 'login'
   domain: 'your.domain-to.authenticate-to.smtp.com'
-  user_name: <%= ENV['MAIL_USERNAME'] %>
+  username: <%= ENV['MAIL_USERNAME'] %>
   password: <%= ENV['MAIL_PASSWORD'] %>
   enable_startttls_auto: true
 ```
 
+### ActiveRecord style keys
+
+In order to be more like ActiveRecord configuration, maildotyml automatically
+maps some configuration keys. For example, ActiveRecord expects a `username` for
+database connection. ActionMailer expects `user_name` for smtp configuration.
+
+With maildotyml, either will work.
+
+#### Supported mappings
+
+* `username` -> `user_name`
+* `host` -> `address`
+
 ## TODO
 
 The following features are planned for the near future:
 
 * Add a generator to create `config/mail.yml.example` with example configuration.
-* Map common ActiveRecord configuration keys.
-  (ie, `username` -> `user_name`).
 
 ## Contributing
 

data/lib/maildotyml/configuration.rb

@@ -15,7 +15,7 @@ module Maildotyml
     end
 
     def settings
-      parsed.reject { |k,v| k == :adapter }
+      map_activerecord_style_keys(parsed.reject { |k,v| k == :adapter })
     end
 
     def present?
@@ -37,5 +37,16 @@ module Maildotyml
       end
     end
 
+    def map_activerecord_style_keys(settings)
+      settings = settings.dup
+      replace_hash_key(settings, :username, :user_name)
+      replace_hash_key(settings, :host, :address)
+
+      settings
+    end
+
+    def replace_hash_key(hash, before, after)
+      hash[after] = hash.delete(before) if hash[before]
+    end
   end
 end

data/lib/maildotyml/version.rb

@@ -1,3 +1,3 @@
 module Maildotyml
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maildotyml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -480117984576728793
+      hash: -1678483686810107958
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -480117984576728793
+      hash: -1678483686810107958
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25