metova 0.0.5 → 0.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +5 -13
  2. data/lib/metova/devise/strategies/token_authenticatable.rb +3 -3
  3. data/lib/metova/mandrill/railtie.rb +6 -6
  4. data/lib/metova/version.rb +1 -1
  5. metadata +24 -23
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YjM5ZGQwYzVhYjc4ZTFjODU4Y2NkNWIzNmRiYzI3YWY5MjM1YTNiYg==
5
- data.tar.gz: !binary |-
6
- MThhOTlkM2M1NGE5Y2JiMGVmMTMzMmZjNzViMTFhZWZmYmQ1MGVhMw==
2
+ SHA1:
3
+ metadata.gz: f304226d6bb3c3def3eb3d5f07651f2ed4038b45
4
+ data.tar.gz: 749590626c27e231a7a92a1431f9c6c5d0ad731f
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- M2E4Mzk0YjNjNDkzYWJlOTQyMzdjMzZkNzdiNzBmYjY1ZDA0YTViMDdlZmI1
10
- NWE3NDVjMmQzOGJlMDRiNDNmYzBjYzI5YzkzNDZkYzc0ZjMyOTEwMGQ5NDNh
11
- NDVhZjc4MWEyNzk2ZTgwY2M1YTZmZDRhN2ExOWIzODUzMWMzMGE=
12
- data.tar.gz: !binary |-
13
- M2I2NGVjOTY0ZWIxODhhZTBmYjNjNjhkNTQ4N2U3N2I2NGE4ZjU0YjRkMmNj
14
- YjAwNzExNGFhZWE0MjhkMjk5MmY4OTVhYTJjNTIzY2I2NTIzOTAwNmQ0YTlm
15
- MThmZGJiNDVjOGZiM2IyZGFlZTIxMDNlODU4N2ViYjIyNTY3ZDc=
6
+ metadata.gz: 41e8b235cd0bfeba0574344c72db8490890dfc3640ec0bacc64b238b9629452046cf283b9a95ec36375d0c965033d4421c2e2c920943e07d63316515fb4fad1f
7
+ data.tar.gz: 236e1f623ef6073824d3cd69f4471cb44b84916443ae55329b31beb48506fcdafd31862d8fc9cce0aaac56905053ddc4c64074eed5021d9cf8107468efb1c7c5
data/lib/metova/devise/strategies/token_authenticatable.rb CHANGED
@@ -5,7 +5,7 @@ module Devise
5
5
  class TokenAuthenticatable < Base
6
6
 
7
7
  def authenticate!
8
- user = mapping.to.find_by(email: options[:email])
8
+ user = mapping.to.find_by id: options[:id]
9
9
  if user && valid_token?(user)
10
10
  success! user
11
11
  else
@@ -14,7 +14,7 @@ module Devise
14
14
  end
15
15
 
16
16
  def valid?
17
- token.present? && options.include?(:email)
17
+ token.present? && options.include?(:id)
18
18
  end
19
19
 
20
20
  private
@@ -32,7 +32,7 @@ module Devise
32
32
  end
33
33
 
34
34
  def token_and_options
35
- @_token_and_options ||= ActionController::HttpAuthentication::Token.token_and_options(request)
35
+ @_token_and_options ||= ActionController::HttpAuthentication::Token.token_and_options(request) || []
36
36
  end
37
37
 
38
38
  end
data/lib/metova/mandrill/railtie.rb CHANGED
@@ -3,10 +3,11 @@ module Metova
3
3
  class Railtie < ::Rails::Railtie
4
4
 
5
5
  initializer "metova.mandrill" do |app|
6
- if ENV['MANDRILL_DOMAIN']
7
-
8
- app.config.action_mailer.default_url_options = { host: (ENV['MANDRILL_DEFAULT_HOST'] || ENV['MANDRILL_DOMAIN']) }
6
+ if ENV['MANDRILL_USERNAME'] && ENV['MANDRILL_PASSWORD']
9
7
  app.config.action_mailer.delivery_method = :smtp
8
+ app.config.action_mailer.default_url_options = { host: ENV['MANDRILL_DEFAULT_HOST'] }
9
+ app.routes.default_url_options = app.config.action_mailer.default_url_options
10
+
10
11
  app.config.action_mailer.smtp_settings = {
11
12
  address: 'smtp.mandrillapp.com',
12
13
  port: 587,
@@ -14,14 +15,13 @@ module Metova
14
15
  authentication: 'login',
15
16
  user_name: ENV['MANDRILL_USERNAME'],
16
17
  password: ENV['MANDRILL_PASSWORD'],
17
- domain: ENV['MANDRILL_DOMAIN']
18
18
  }
19
19
 
20
- app.routes.default_url_options = app.config.action_mailer.default_url_options
20
+ app.config.action_mailer.smtp_settings.merge! domain: ENV['MANDRILL_DOMAIN'] if ENV['MANDRILL_DOMAIN']
21
21
 
22
22
  end
23
23
  end
24
24
 
25
25
  end
26
26
  end
27
- end
27
+ end
data/lib/metova/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Metova
2
- VERSION = '0.0.5'
2
+ VERSION = '0.0.6'
3
3
  end
metadata CHANGED
@@ -1,139 +1,139 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metova
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Logan Serman
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-23 00:00:00.000000000 Z
11
+ date: 2015-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: kaminari
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.16.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.16.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: devise
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ! '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: 3.2.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ! '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: 3.2.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: responders
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '2.0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '2.0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ! '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ! '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ! '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ! '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: carrierwave
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ! '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ! '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: textacular
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ! '>='
115
+ - - ">="
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ! '>='
122
+ - - ">="
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: pg
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ! '>='
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ! '>='
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  description: Metova libraries for Ruby on Rails
@@ -184,18 +184,19 @@ require_paths:
184
184
  - lib
185
185
  required_ruby_version: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - ! '>='
187
+ - - ">="
188
188
  - !ruby/object:Gem::Version
189
189
  version: 2.0.0
190
190
  required_rubygems_version: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ! '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  requirements: []
196
196
  rubyforge_project:
197
- rubygems_version: 2.4.5
197
+ rubygems_version: 2.2.2
198
198
  signing_key:
199
199
  specification_version: 4
200
200
  summary: Metova libraries for Ruby on Rails
201
201
  test_files: []
202
+ has_rdoc: