uri_config 0.0.10 → 0.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop.yml +19 -3
- data/.travis.yml +4 -1
- data/Rakefile +7 -7
- data/lib/uri_config/action_mailer_config.rb +3 -3
- data/lib/uri_config/config.rb +10 -5
- data/lib/uri_config/version.rb +1 -1
- data/spec/action_mailer_config_spec.rb +17 -17
- data/spec/config_spec.rb +14 -14
- data/spec/s3_config_spec.rb +5 -5
- data/uri_config.gemspec +1 -1
- metadata +5 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 26c570098fd866246259d48546e09c7cc2372cd4
|
4
|
+
data.tar.gz: 527aebc4d0a5587ff7e3792fd562938af814274c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: df17aec07d709f3b182d60f4767805b0bcd9f0bd76a98b4c74992c7945f81c7050d3a77f17af53a2ca9d05907f46cb168ea074ed578ca46cc421c20cd639b111
|
7
|
+
data.tar.gz: accaddadc9d4b5f71401f7285e2c92e41000ee54ff0b07e0ac6db992626abc7bf9b1a9a5bd9b20043265d7ffc442de2b7fe92404abed0b2c9d8aca15cdd82cd0
|
data/.rubocop.yml
CHANGED
@@ -1,14 +1,30 @@
|
|
1
1
|
Metrics/LineLength:
|
2
2
|
Max: 160
|
3
3
|
|
4
|
+
Metrics/ModuleLength:
|
5
|
+
Enabled: false
|
6
|
+
|
4
7
|
Style/Documentation:
|
5
8
|
Enabled: false
|
6
9
|
|
7
|
-
Style/
|
8
|
-
|
10
|
+
Style/MultilineBlockChain:
|
11
|
+
Enabled: false
|
9
12
|
|
10
13
|
Style/StringLiterals:
|
11
14
|
Enabled: false
|
12
15
|
|
13
|
-
Style/
|
16
|
+
Style/SymbolProc:
|
17
|
+
Enabled: false
|
18
|
+
|
19
|
+
Style/TrailingCommaInLiteral:
|
14
20
|
EnforcedStyleForMultiline: comma
|
21
|
+
|
22
|
+
# 1.8 compatible :(
|
23
|
+
Style/HashSyntax:
|
24
|
+
EnforcedStyle: hash_rockets
|
25
|
+
Style/TrailingCommaInArguments:
|
26
|
+
EnforcedStyleForMultiline: no_comma
|
27
|
+
Style/DotPosition:
|
28
|
+
EnforcedStyle: trailing
|
29
|
+
Style/EachWithObject:
|
30
|
+
Enabled: false
|
data/.travis.yml
CHANGED
data/Rakefile
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
require "bundler/gem_tasks"
|
2
|
-
require "rspec/core/rake_task"
|
3
|
-
require 'rubocop/rake_task'
|
4
2
|
|
3
|
+
require "rspec/core/rake_task"
|
5
4
|
RSpec::Core::RakeTask.new
|
6
|
-
|
5
|
+
task :default => :spec
|
7
6
|
|
8
|
-
|
9
|
-
|
10
|
-
:rubocop
|
11
|
-
|
7
|
+
if RUBY_VERSION >= "1.9"
|
8
|
+
require "rubocop/rake_task"
|
9
|
+
RuboCop::RakeTask.new(:rubocop)
|
10
|
+
task :default => :rubocop
|
11
|
+
end
|
@@ -2,8 +2,8 @@ require 'uri_config'
|
|
2
2
|
|
3
3
|
module URIConfig
|
4
4
|
class ActionMailerConfig < URIConfig::Config
|
5
|
-
map :address, from
|
6
|
-
map :user_name, from
|
5
|
+
map :address, :from => :host
|
6
|
+
map :user_name, :from => :username
|
7
7
|
|
8
8
|
parameter :authentication
|
9
9
|
parameter :domain
|
@@ -19,7 +19,7 @@ module URIConfig
|
|
19
19
|
:user_name,
|
20
20
|
:password,
|
21
21
|
:authentication,
|
22
|
-
:domain
|
22
|
+
:domain
|
23
23
|
)
|
24
24
|
end
|
25
25
|
end
|
data/lib/uri_config/config.rb
CHANGED
@@ -3,6 +3,8 @@ require 'cgi'
|
|
3
3
|
|
4
4
|
module URIConfig
|
5
5
|
class Config
|
6
|
+
FETCH_ERROR = (RUBY_VERSION < "1.9" ? ::IndexError : ::KeyError)
|
7
|
+
|
6
8
|
def initialize(url)
|
7
9
|
@url = url
|
8
10
|
end
|
@@ -19,7 +21,7 @@ module URIConfig
|
|
19
21
|
|
20
22
|
def self.configure_from(env_var, &block)
|
21
23
|
configure_from!(env_var, &block)
|
22
|
-
rescue
|
24
|
+
rescue FETCH_ERROR
|
23
25
|
nil
|
24
26
|
end
|
25
27
|
|
@@ -36,7 +38,7 @@ module URIConfig
|
|
36
38
|
def self.values_from(env_var, *params)
|
37
39
|
config = configure_from!(env_var)
|
38
40
|
|
39
|
-
params.map { |param| config.
|
41
|
+
params.map { |param| config.send(param) }
|
40
42
|
end
|
41
43
|
|
42
44
|
def ==(other)
|
@@ -74,9 +76,12 @@ module URIConfig
|
|
74
76
|
|
75
77
|
def self.config(*keys)
|
76
78
|
define_method :config do
|
77
|
-
keys
|
78
|
-
|
79
|
-
|
79
|
+
keys.
|
80
|
+
inject({}) do |hash, key|
|
81
|
+
hash[key] = send(key)
|
82
|
+
hash
|
83
|
+
end.
|
84
|
+
reject { |_, value| value.nil? }
|
80
85
|
end
|
81
86
|
end
|
82
87
|
|
data/lib/uri_config/version.rb
CHANGED
@@ -6,27 +6,27 @@ module URIConfig
|
|
6
6
|
|
7
7
|
{
|
8
8
|
"smtps://MANDRILL_USERNAME:MANDRILL_PASSWORD@smtp.mandrillapp.com:25/?authentication=login&domain=yourdomain.com" => {
|
9
|
-
address
|
10
|
-
port
|
11
|
-
enable_starttls_auto
|
12
|
-
user_name
|
13
|
-
password
|
14
|
-
authentication
|
15
|
-
domain
|
9
|
+
:address => "smtp.mandrillapp.com",
|
10
|
+
:port => 25,
|
11
|
+
:enable_starttls_auto => true,
|
12
|
+
:user_name => "MANDRILL_USERNAME",
|
13
|
+
:password => "MANDRILL_PASSWORD",
|
14
|
+
:authentication => 'login',
|
15
|
+
:domain => 'yourdomain.com',
|
16
16
|
},
|
17
17
|
"smtp://MANDRILL_USERNAME:MANDRILL_PASSWORD@smtp.mandrillapp.com:2525/?authentication=plain&domain=yourdomain.com" => {
|
18
|
-
address
|
19
|
-
port
|
20
|
-
enable_starttls_auto
|
21
|
-
user_name
|
22
|
-
password
|
23
|
-
authentication
|
24
|
-
domain
|
18
|
+
:address => "smtp.mandrillapp.com",
|
19
|
+
:port => 2525,
|
20
|
+
:enable_starttls_auto => false,
|
21
|
+
:user_name => "MANDRILL_USERNAME",
|
22
|
+
:password => "MANDRILL_PASSWORD",
|
23
|
+
:authentication => 'plain',
|
24
|
+
:domain => 'yourdomain.com',
|
25
25
|
},
|
26
26
|
"smtp://localhost:1025" => {
|
27
|
-
address
|
28
|
-
port
|
29
|
-
enable_starttls_auto
|
27
|
+
:address => "localhost",
|
28
|
+
:port => 1025,
|
29
|
+
:enable_starttls_auto => false,
|
30
30
|
},
|
31
31
|
}.each do |url, components|
|
32
32
|
context "with a URL of #{url}" do
|
data/spec/config_spec.rb
CHANGED
@@ -6,23 +6,23 @@ module URIConfig
|
|
6
6
|
|
7
7
|
{
|
8
8
|
"https://TESTMERCHANT1:abcd1234abcd@secure.ap.tnspayments.com" => {
|
9
|
-
username
|
10
|
-
password
|
11
|
-
base_uri
|
9
|
+
:username => 'TESTMERCHANT1',
|
10
|
+
:password => 'abcd1234abcd',
|
11
|
+
:base_uri => 'https://secure.ap.tnspayments.com',
|
12
12
|
},
|
13
13
|
"https://foo:bar@us-west-2.amazonaws.com/namespace" => {
|
14
|
-
username
|
15
|
-
password
|
16
|
-
path
|
14
|
+
:username => "foo",
|
15
|
+
:password => "bar",
|
16
|
+
:path => "/namespace",
|
17
17
|
},
|
18
18
|
"https://AKIAJBPUOK67MOQ3VVXQ:7d123FASD123sljnfdsaSADFasdfhsdf12ddFDH4@s3.amazonaws.com/bucket_name" => {
|
19
|
-
username
|
20
|
-
password
|
21
|
-
path
|
19
|
+
:username => "AKIAJBPUOK67MOQ3VVXQ",
|
20
|
+
:password => "7d123FASD123sljnfdsaSADFasdfhsdf12ddFDH4",
|
21
|
+
:path => "/bucket_name",
|
22
22
|
},
|
23
23
|
"https://example.com:8080" => {
|
24
|
-
host
|
25
|
-
port
|
24
|
+
:host => "example.com",
|
25
|
+
:port => 8080,
|
26
26
|
},
|
27
27
|
}.each do |url, components|
|
28
28
|
context "with a URL of #{url}" do
|
@@ -41,7 +41,7 @@ module URIConfig
|
|
41
41
|
specify do
|
42
42
|
expect do
|
43
43
|
URIConfig::Config.values_from("TEST_URL")
|
44
|
-
end.to raise_error
|
44
|
+
end.to raise_error Config::FETCH_ERROR
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
@@ -56,7 +56,7 @@ module URIConfig
|
|
56
56
|
|
57
57
|
specify do
|
58
58
|
expect(
|
59
|
-
URIConfig::Config.values_from("TEST_URL", :username, :password)
|
59
|
+
URIConfig::Config.values_from("TEST_URL", :username, :password)
|
60
60
|
).to eq(%w(user pass))
|
61
61
|
end
|
62
62
|
end
|
@@ -109,7 +109,7 @@ module URIConfig
|
|
109
109
|
specify do
|
110
110
|
expect do
|
111
111
|
URIConfig::Config.configure_from!("TEST_URL") {}
|
112
|
-
end.to raise_error
|
112
|
+
end.to raise_error Config::FETCH_ERROR
|
113
113
|
end
|
114
114
|
end
|
115
115
|
|
data/spec/s3_config_spec.rb
CHANGED
@@ -2,8 +2,8 @@ require 'uri_config'
|
|
2
2
|
|
3
3
|
module URIConfig
|
4
4
|
class S3Config < Config
|
5
|
-
map :access_key_id, from
|
6
|
-
map :secret_access_key, from
|
5
|
+
map :access_key_id, :from => :username
|
6
|
+
map :secret_access_key, :from => :password
|
7
7
|
|
8
8
|
def bucket
|
9
9
|
path[1..-1]
|
@@ -17,9 +17,9 @@ module URIConfig
|
|
17
17
|
|
18
18
|
{
|
19
19
|
"https://AKIAJBPUOK67MOQ3VVXQ:7d123FASD123sljnfdsaSADFasdfhsdf12ddFDH4@s3.amazonaws.com/bucket_name" => {
|
20
|
-
access_key_id
|
21
|
-
secret_access_key
|
22
|
-
bucket
|
20
|
+
:access_key_id => "AKIAJBPUOK67MOQ3VVXQ",
|
21
|
+
:secret_access_key => "7d123FASD123sljnfdsaSADFasdfhsdf12ddFDH4",
|
22
|
+
:bucket => "bucket_name",
|
23
23
|
},
|
24
24
|
}.each do |url, components|
|
25
25
|
context "with a URL of #{url}" do
|
data/uri_config.gemspec
CHANGED
@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.add_development_dependency "bundler", "~> 1.6"
|
22
22
|
spec.add_development_dependency "rake", "~> 10.0"
|
23
23
|
spec.add_development_dependency "rspec", "~> 3.1.0"
|
24
|
-
spec.add_development_dependency "rubocop", "~> 0.
|
24
|
+
spec.add_development_dependency "rubocop", "~> 0.41.2" if RUBY_VERSION >= "1.9"
|
25
25
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: uri_config
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathon M. Abbott
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-07-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -58,14 +58,14 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 0.
|
61
|
+
version: 0.41.2
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 0.
|
68
|
+
version: 0.41.2
|
69
69
|
description: extract configuration from URIs
|
70
70
|
email:
|
71
71
|
- jonathona@everydayhero.com.au
|
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
109
109
|
version: '0'
|
110
110
|
requirements: []
|
111
111
|
rubyforge_project:
|
112
|
-
rubygems_version: 2.
|
112
|
+
rubygems_version: 2.5.1
|
113
113
|
signing_key:
|
114
114
|
specification_version: 4
|
115
115
|
summary: extract configuration from URIs
|
@@ -117,4 +117,3 @@ test_files:
|
|
117
117
|
- spec/action_mailer_config_spec.rb
|
118
118
|
- spec/config_spec.rb
|
119
119
|
- spec/s3_config_spec.rb
|
120
|
-
has_rdoc:
|