catarse_monkeymail 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +163 -161
  3. data/app/models/catarse_monkeymail/user_concern.rb +3 -3
  4. data/lib/catarse_monkeymail/version.rb +1 -1
  5. data/spec/spec_helper.rb +0 -4
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2815b8bb55fcb78fafd80bece84c881f7b99eaa7
4
- data.tar.gz: 2615c87d20394b1efaa5268f9e868b0ef7951112
3
+ metadata.gz: 6e0f501b7e6ce92b87560985b16a4ef571cf64b2
4
+ data.tar.gz: 56a90da30e27df90ba6ecc458855d7d1fbe75b59
5
5
  SHA512:
6
- metadata.gz: f1a8597caf43cbd926b79f7746657288a5b0ee3c89788bfbaa159a8a2a6d659b63f9da72471ce871367510163a198d1455998329344c75a6402e8181b4d20eed
7
- data.tar.gz: 2d2bb784080a246fc9aa088c86f2c292842d4205334d84dd8101667429111096032af7a0a5c9e108f3b804a2efe1b667686c73fe7be930622befcb94c5128a49
6
+ metadata.gz: edf5d4f932663db756e9fc85ea4cd43b23e9db729ef4a9d580cac28ca8ed2b9e805761eea7dc650ec9a1ac85ce237b923f906b56a6ac6b8129c79123a373618a
7
+ data.tar.gz: c05da0eb003cffa900a5e5e5cbe39440496cea7d6d55116f6620e05b9389f643add39456cc2a60be25b39c80284c8475c3a3954431df642350b0251ec660e339
data/Gemfile.lock CHANGED
@@ -7,18 +7,10 @@ GIT
7
7
  jquery-rails
8
8
  rails (~> 4)
9
9
 
10
- GIT
11
- remote: git://github.com/catarse/catarse_mailchimp
12
- revision: 2ed4f3931dfa292e5c1c62619772f04e41c68629
13
- ref: 2ed4f39
14
- specs:
15
- catarse_mailchimp (0.0.1)
16
- mailchimp
17
- supermodel
18
-
19
10
  GIT
20
11
  remote: git://github.com/catarse/moip-ruby.git
21
12
  revision: c0225ad71645cd1df35dafa1e45c9f092b3abb9e
13
+ ref: c0225ad71645cd1df35dafa1e45c9f092b3abb9e
22
14
  specs:
23
15
  moip (1.0.2)
24
16
  activesupport (>= 2.3.2)
@@ -28,28 +20,32 @@ GIT
28
20
  PATH
29
21
  remote: .
30
22
  specs:
31
- catarse_monkeymail (0.1.1)
23
+ catarse_monkeymail (0.1.3)
32
24
  mailchimp-api (~> 2.0.4)
33
- rails (~> 4.0.3)
25
+ rails (>= 4.0.3)
34
26
 
35
27
  GEM
36
28
  remote: https://rubygems.org/
37
29
  remote: https://rubygems.org/
38
30
  specs:
39
31
  RedCloth (4.2.9)
40
- actionmailer (4.0.3)
41
- actionpack (= 4.0.3)
32
+ actionmailer (4.1.1)
33
+ actionpack (= 4.1.1)
34
+ actionview (= 4.1.1)
42
35
  mail (~> 2.5.4)
43
- actionpack (4.0.3)
44
- activesupport (= 4.0.3)
45
- builder (~> 3.1.0)
46
- erubis (~> 2.7.0)
36
+ actionpack (4.1.1)
37
+ actionview (= 4.1.1)
38
+ activesupport (= 4.1.1)
47
39
  rack (~> 1.5.2)
48
40
  rack-test (~> 0.6.2)
49
- active_utils (2.0.2)
41
+ actionview (4.1.1)
42
+ activesupport (= 4.1.1)
43
+ builder (~> 3.1)
44
+ erubis (~> 2.7.0)
45
+ active_utils (2.2.1)
50
46
  activesupport (>= 2.3.11)
51
47
  i18n
52
- activemerchant (1.42.6)
48
+ activemerchant (1.43.1)
53
49
  active_utils (~> 2.0, >= 2.0.1)
54
50
  activesupport (>= 2.3.14, < 5.0.0)
55
51
  builder (>= 2.1.2, < 4.0.0)
@@ -57,23 +53,21 @@ GEM
57
53
  json (~> 1.7)
58
54
  money (< 7.0.0)
59
55
  nokogiri (~> 1.4)
60
- activemodel (4.0.3)
61
- activesupport (= 4.0.3)
62
- builder (~> 3.1.0)
63
- activerecord (4.0.3)
64
- activemodel (= 4.0.3)
65
- activerecord-deprecated_finders (~> 1.0.2)
66
- activesupport (= 4.0.3)
67
- arel (~> 4.0.0)
68
- activerecord-deprecated_finders (1.0.3)
69
- activesupport (4.0.3)
70
- i18n (~> 0.6, >= 0.6.4)
71
- minitest (~> 4.2)
72
- multi_json (~> 1.3)
56
+ activemodel (4.1.1)
57
+ activesupport (= 4.1.1)
58
+ builder (~> 3.1)
59
+ activerecord (4.1.1)
60
+ activemodel (= 4.1.1)
61
+ activesupport (= 4.1.1)
62
+ arel (~> 5.0.0)
63
+ activesupport (4.1.1)
64
+ i18n (~> 0.6, >= 0.6.9)
65
+ json (~> 1.7, >= 1.7.7)
66
+ minitest (~> 5.1)
73
67
  thread_safe (~> 0.1)
74
- tzinfo (~> 0.3.37)
75
- addressable (2.3.5)
76
- arel (4.0.2)
68
+ tzinfo (~> 1.1)
69
+ addressable (2.3.6)
70
+ arel (5.0.1.20140414130214)
77
71
  auto_html (1.4.2)
78
72
  RedCloth
79
73
  redcarpet
@@ -85,8 +79,8 @@ GEM
85
79
  erubis (>= 2.6.6)
86
80
  binding_of_caller (0.7.2)
87
81
  debug_inspector (>= 0.0.1)
88
- browser (0.3.2)
89
- builder (3.1.4)
82
+ browser (0.6.0)
83
+ builder (3.2.2)
90
84
  capybara (2.1.0)
91
85
  mime-types (>= 1.16)
92
86
  nokogiri (>= 1.3.3)
@@ -106,14 +100,14 @@ GEM
106
100
  activemerchant (>= 1.34.0)
107
101
  rails (~> 4.0)
108
102
  slim-rails
109
- catarse_settings_db (0.0.1)
110
- rails (~> 4.0.3)
103
+ catarse_settings_db (0.0.2)
104
+ rails (~> 4.1.1)
111
105
  celluloid (0.15.2)
112
106
  timers (~> 1.1.0)
113
- chartkick (1.2.1)
114
- childprocess (0.4.0)
107
+ chartkick (1.2.4)
108
+ childprocess (0.5.3)
115
109
  ffi (~> 1.0, >= 1.0.11)
116
- chunky_png (1.2.9)
110
+ chunky_png (1.3.1)
117
111
  cliver (0.3.2)
118
112
  coderay (1.1.0)
119
113
  coffee-rails (4.0.1)
@@ -122,16 +116,17 @@ GEM
122
116
  coffee-script (2.2.0)
123
117
  coffee-script-source
124
118
  execjs
125
- coffee-script-source (1.6.3)
126
- compass (0.12.2)
119
+ coffee-script-source (1.7.0)
120
+ compass (0.12.6)
127
121
  chunky_png (~> 1.2)
128
122
  fssm (>= 0.2.7)
129
- sass (~> 3.1)
123
+ sass (~> 3.2.19)
130
124
  compass-960-plugin (0.10.4)
131
125
  compass (>= 0.10.0)
132
- compass-rails (1.1.3)
126
+ compass-rails (1.1.7)
133
127
  compass (>= 0.12.2)
134
- connection_pool (1.2.0)
128
+ sprockets (<= 2.11.0)
129
+ connection_pool (2.0.0)
135
130
  coveralls (0.7.0)
136
131
  multi_json (~> 1.3)
137
132
  rest-client
@@ -140,7 +135,7 @@ GEM
140
135
  thor
141
136
  crack (0.1.8)
142
137
  curb (0.8.5)
143
- database_cleaner (1.2.0)
138
+ database_cleaner (1.3.0)
144
139
  debug_inspector (0.0.2)
145
140
  devise (3.2.4)
146
141
  bcrypt (~> 3.0)
@@ -149,8 +144,10 @@ GEM
149
144
  thread_safe (~> 0.1)
150
145
  warden (~> 1.2.3)
151
146
  diff-lcs (1.2.5)
152
- docile (1.1.1)
153
- dotenv (0.9.0)
147
+ docile (1.1.3)
148
+ dotenv (0.11.1)
149
+ dotenv-deployment (~> 0.0.2)
150
+ dotenv-deployment (0.0.2)
154
151
  draper (1.3.0)
155
152
  actionpack (>= 3.0)
156
153
  activemodel (>= 3.0)
@@ -159,105 +156,110 @@ GEM
159
156
  enumerate_it (1.2.1)
160
157
  activesupport (>= 3.0.0)
161
158
  erubis (2.7.0)
162
- excon (0.31.0)
163
- execjs (2.0.2)
159
+ excon (0.36.0)
160
+ execjs (2.1.0)
164
161
  ezcrypto (0.7.2)
165
- factory_girl (4.3.0)
162
+ factory_girl (4.4.0)
166
163
  activesupport (>= 3.0.0)
167
- factory_girl_rails (4.3.0)
168
- factory_girl (~> 4.3.0)
164
+ factory_girl_rails (4.4.1)
165
+ factory_girl (~> 4.4.0)
169
166
  railties (>= 3.0.0)
170
167
  fakeweb (1.3.0)
171
- faraday (0.8.8)
172
- multipart-post (~> 1.2.0)
173
- feedzirra (0.7.0)
168
+ faraday (0.9.0)
169
+ multipart-post (>= 1.2, < 3)
170
+ feedjira (1.3.0)
174
171
  curb (~> 0.8.1)
175
- loofah (~> 1.2.1)
172
+ loofah (~> 2.0.0)
176
173
  sax-machine (~> 0.2.1)
177
174
  ffi (1.9.3)
178
- fog (1.19.0)
175
+ fog (1.22.1)
176
+ fog-brightbox
177
+ fog-core (~> 1.22)
178
+ fog-json
179
+ ipaddress (~> 0.5)
180
+ nokogiri (~> 1.5, >= 1.5.11)
181
+ fog-brightbox (0.0.2)
182
+ fog-core
183
+ fog-json
184
+ fog-core (1.22.0)
179
185
  builder
180
- excon (~> 0.31.0)
181
- formatador (~> 0.2.0)
186
+ excon (~> 0.33)
187
+ formatador (~> 0.2)
182
188
  mime-types
183
- multi_json (~> 1.0)
184
189
  net-scp (~> 1.1)
185
190
  net-ssh (>= 2.1.3)
186
- nokogiri (~> 1.5)
187
- ruby-hmac
188
- foreman (0.63.0)
189
- dotenv (>= 0.7)
190
- thor (>= 0.13.6)
191
- formatador (0.2.4)
191
+ fog-json (1.0.0)
192
+ multi_json (~> 1.0)
193
+ foreman (0.71.0)
194
+ dotenv (~> 0.11.1)
195
+ thor (~> 0.19.1)
196
+ formatador (0.2.5)
192
197
  formtastic (2.2.1)
193
198
  actionpack (>= 3.0)
194
199
  fssm (0.2.10)
195
200
  has_scope (0.6.0.rc)
196
201
  actionpack (>= 3.2, < 5)
197
202
  activesupport (>= 3.2, < 5)
198
- hashie (2.0.5)
203
+ hashie (2.1.1)
199
204
  heroku-deflater (0.5.3)
200
205
  rack (>= 1.4.5)
201
206
  high_voltage (2.1.0)
202
207
  hike (1.2.3)
203
- htmlentities (4.3.1)
204
- http_accept_language (2.0.0)
208
+ htmlentities (4.3.2)
209
+ http_accept_language (2.0.1)
205
210
  httparty (0.6.1)
206
211
  crack (= 0.1.8)
207
- httpauth (0.2.0)
212
+ httpauth (0.2.1)
208
213
  httpclient (2.3.4.1)
209
214
  i18n (0.6.9)
210
215
  inherited_resources (1.4.1)
211
216
  has_scope (~> 0.6.0.rc)
212
217
  responders (~> 1.0.0.rc)
218
+ ipaddress (0.8.0)
213
219
  jasmine-core (2.0.0)
214
- jasmine-rails (0.6.0)
220
+ jasmine-rails (0.9.0)
215
221
  jasmine-core (>= 1.3, < 3.0)
216
222
  phantomjs
217
- rails (>= 3.1.0)
223
+ railties (>= 3.1.0)
218
224
  sprockets-rails
219
- jquery-rails (3.0.4)
225
+ jquery-rails (3.1.0)
220
226
  railties (>= 3.0, < 5.0)
221
227
  thor (>= 0.14, < 2.0)
222
228
  json (1.8.1)
223
- jwt (0.1.8)
229
+ jwt (0.1.13)
224
230
  multi_json (>= 1.5)
225
- kaminari (0.15.0)
231
+ kaminari (0.15.1)
226
232
  actionpack (>= 3.0.0)
227
233
  activesupport (>= 3.0.0)
228
- kgio (2.8.1)
234
+ kgio (2.9.2)
229
235
  launchy (2.4.2)
230
236
  addressable (~> 2.3)
231
237
  letter_opener (1.2.0)
232
238
  launchy (~> 2.2)
233
239
  libxml-ruby (2.6.0)
234
- loofah (1.2.1)
235
- nokogiri (>= 1.4.4)
240
+ loofah (2.0.0)
241
+ nokogiri (>= 1.5.9)
236
242
  mail (2.5.4)
237
243
  mime-types (~> 1.16)
238
244
  treetop (~> 1.4.8)
239
- mailchimp (0.0.9)
240
- httparty
241
245
  mailchimp-api (2.0.4)
242
246
  excon (>= 0.16.0)
243
247
  json (>= 1.7.7)
244
248
  method_source (0.8.2)
245
249
  mime-types (1.25.1)
246
- mini_portile (0.5.2)
247
- minitest (4.7.5)
250
+ mini_portile (0.6.0)
251
+ minitest (5.3.4)
248
252
  mixpanel-ruby (1.4.0)
249
- monetize (0.1.4)
250
- money (6.0.1)
253
+ money (6.1.1)
251
254
  i18n (~> 0.6.4)
252
- monetize (~> 0.1.3)
253
- multi_json (1.9.2)
254
- multipart-post (1.2.0)
255
- net-scp (1.1.2)
255
+ multi_json (1.10.1)
256
+ multipart-post (2.0.0)
257
+ net-scp (1.2.1)
256
258
  net-ssh (>= 2.6.5)
257
- net-ssh (2.7.0)
259
+ net-ssh (2.9.1)
258
260
  newrelic_rpm (3.6.5.130)
259
- nokogiri (1.6.1)
260
- mini_portile (~> 0.5.0)
261
+ nokogiri (1.6.2.1)
262
+ mini_portile (= 0.6.0)
261
263
  oauth (0.4.7)
262
264
  oauth2 (0.8.1)
263
265
  faraday (~> 0.8)
@@ -265,9 +267,9 @@ GEM
265
267
  jwt (~> 0.1.4)
266
268
  multi_json (~> 1.0)
267
269
  rack (~> 1.2)
268
- omniauth (1.1.4)
270
+ omniauth (1.2.1)
269
271
  hashie (>= 1.2, < 3)
270
- rack
272
+ rack (~> 1.0)
271
273
  omniauth-facebook (1.4.0)
272
274
  omniauth-oauth2 (~> 1.0.2)
273
275
  omniauth-oauth (1.0.1)
@@ -281,43 +283,45 @@ GEM
281
283
  omniauth-oauth (~> 1.0)
282
284
  orm_adapter (0.5.0)
283
285
  pg (0.17.1)
284
- pg_search (0.7.2)
286
+ pg_search (0.7.4)
285
287
  activerecord (>= 3.1)
286
288
  activesupport (>= 3.1)
287
289
  arel
288
- phantomjs (1.9.7.0)
289
- poltergeist (1.5.0)
290
+ phantomjs (1.9.7.1)
291
+ poltergeist (1.5.1)
290
292
  capybara (~> 2.1)
291
293
  cliver (~> 0.3.1)
292
294
  multi_json (~> 1.0)
293
295
  websocket-driver (>= 0.2.0)
294
- polyglot (0.3.4)
296
+ polyglot (0.3.5)
295
297
  postgres-copy (0.8.0)
296
298
  activerecord (~> 4.0)
297
299
  pg
298
300
  rails (~> 4.0)
299
301
  responders
300
- protected_attributes (1.0.5)
302
+ protected_attributes (1.0.7)
301
303
  activemodel (>= 4.0.1, < 5.0)
302
- pry (0.9.12.4)
304
+ pry (0.9.12.6)
303
305
  coderay (~> 1.0)
304
306
  method_source (~> 0.8)
305
307
  slop (~> 3.4)
306
- pundit (0.2.1)
308
+ pundit (0.2.3)
307
309
  activesupport (>= 3.0.0)
308
310
  rack (1.5.2)
309
- rack-protection (1.5.1)
311
+ rack-protection (1.5.3)
310
312
  rack
311
313
  rack-test (0.6.2)
312
314
  rack (>= 1.0)
313
- rails (4.0.3)
314
- actionmailer (= 4.0.3)
315
- actionpack (= 4.0.3)
316
- activerecord (= 4.0.3)
317
- activesupport (= 4.0.3)
315
+ rails (4.1.1)
316
+ actionmailer (= 4.1.1)
317
+ actionpack (= 4.1.1)
318
+ actionview (= 4.1.1)
319
+ activemodel (= 4.1.1)
320
+ activerecord (= 4.1.1)
321
+ activesupport (= 4.1.1)
318
322
  bundler (>= 1.3.0, < 2.0)
319
- railties (= 4.0.3)
320
- sprockets-rails (~> 2.0.0)
323
+ railties (= 4.1.1)
324
+ sprockets-rails (~> 2.0)
321
325
  rails-observers (0.1.2)
322
326
  activemodel (~> 4.0)
323
327
  rails_12factor (0.0.2)
@@ -325,17 +329,17 @@ GEM
325
329
  rails_stdout_logging
326
330
  rails_serve_static_assets (0.0.2)
327
331
  rails_stdout_logging (0.0.3)
328
- railties (4.0.3)
329
- actionpack (= 4.0.3)
330
- activesupport (= 4.0.3)
332
+ railties (4.1.1)
333
+ actionpack (= 4.1.1)
334
+ activesupport (= 4.1.1)
331
335
  rake (>= 0.8.7)
332
336
  thor (>= 0.18.1, < 2.0)
333
- raindrops (0.12.0)
334
- rake (10.2.2)
335
- ranked-model (0.3)
337
+ raindrops (0.13.0)
338
+ rake (10.3.2)
339
+ ranked-model (0.4.0)
336
340
  activerecord (>= 3.1.12)
337
- redcarpet (3.0.0)
338
- redis (3.0.6)
341
+ redcarpet (3.1.2)
342
+ redis (3.0.7)
339
343
  redis-namespace (1.4.1)
340
344
  redis (~> 3.0.4)
341
345
  request_store (1.0.5)
@@ -347,11 +351,11 @@ GEM
347
351
  rmagick (2.13.2)
348
352
  routing-filter (0.4.0.pre)
349
353
  actionpack
350
- rspec-core (2.14.7)
351
- rspec-expectations (2.14.4)
354
+ rspec-core (2.14.8)
355
+ rspec-expectations (2.14.5)
352
356
  diff-lcs (>= 1.1.3, < 2.0)
353
- rspec-mocks (2.14.4)
354
- rspec-rails (2.14.1)
357
+ rspec-mocks (2.14.6)
358
+ rspec-rails (2.14.2)
355
359
  actionpack (>= 3.0)
356
360
  activemodel (>= 3.0)
357
361
  activesupport (>= 3.0)
@@ -359,31 +363,31 @@ GEM
359
363
  rspec-core (~> 2.14.0)
360
364
  rspec-expectations (~> 2.14.0)
361
365
  rspec-mocks (~> 2.14.0)
362
- ruby-hmac (0.4.0)
363
366
  ruby-ole (1.2.11.7)
364
- rubyzip (1.1.0)
365
- sass (3.2.13)
366
- sass-rails (4.0.1)
367
+ rubyzip (1.1.4)
368
+ sass (3.2.19)
369
+ sass-rails (4.0.3)
367
370
  railties (>= 4.0.0, < 5.0)
368
- sass (>= 3.1.10)
369
- sprockets-rails (~> 2.0.0)
371
+ sass (~> 3.2.0)
372
+ sprockets (~> 2.8, <= 2.11.0)
373
+ sprockets-rails (~> 2.0)
370
374
  sax-machine (0.2.1)
371
375
  nokogiri (~> 1.6.0)
372
376
  schema_associations (1.2.0)
373
377
  schema_plus (>= 1.2.0)
374
- schema_plus (1.3.2)
375
- rails (>= 3.2)
378
+ schema_plus (1.5.1)
379
+ activerecord (>= 3.2)
376
380
  valuable
377
- selenium-webdriver (2.39.0)
378
- childprocess (>= 0.2.5)
381
+ selenium-webdriver (2.42.0)
382
+ childprocess (>= 0.5.0)
379
383
  multi_json (~> 1.0)
380
384
  rubyzip (~> 1.0)
381
385
  websocket (~> 1.0.4)
382
386
  shoulda (3.5.0)
383
387
  shoulda-context (~> 1.0, >= 1.0.1)
384
388
  shoulda-matchers (>= 1.4.1, < 3.0)
385
- shoulda-context (1.1.6)
386
- shoulda-matchers (2.4.0)
389
+ shoulda-context (1.2.1)
390
+ shoulda-matchers (2.6.1)
387
391
  activesupport (>= 3.0.0)
388
392
  sidekiq (2.15.2)
389
393
  celluloid (>= 0.15.2)
@@ -391,75 +395,74 @@ GEM
391
395
  json
392
396
  redis (>= 3.0.4)
393
397
  redis-namespace (>= 1.3.1)
394
- simple_form (3.0.1)
395
- actionpack (>= 4.0.0, < 4.1)
396
- activemodel (>= 4.0.0, < 4.1)
398
+ simple_form (3.0.2)
399
+ actionpack (~> 4.0)
400
+ activemodel (~> 4.0)
397
401
  simplecov (0.8.2)
398
402
  docile (~> 1.1.0)
399
403
  multi_json
400
404
  simplecov-html (~> 0.8.0)
401
405
  simplecov-html (0.8.0)
402
- sinatra (1.4.4)
406
+ sinatra (1.4.5)
403
407
  rack (~> 1.4)
404
408
  rack-protection (~> 1.4)
405
409
  tilt (~> 1.3, >= 1.3.4)
406
410
  slim (2.0.2)
407
411
  temple (~> 0.6.6)
408
412
  tilt (>= 1.3.3, < 2.1)
409
- slim-rails (2.1.2)
410
- actionpack (>= 3.0, < 4.1)
411
- activesupport (>= 3.0, < 4.1)
412
- railties (>= 3.0, < 4.1)
413
+ slim-rails (2.1.4)
414
+ actionpack (>= 3.0, < 4.2)
415
+ activesupport (>= 3.0, < 4.2)
416
+ railties (>= 3.0, < 4.2)
413
417
  slim (~> 2.0)
414
- slop (3.4.7)
418
+ slop (3.5.0)
415
419
  spectator-validates_email (0.2.0)
416
420
  activemodel (>= 3.0.0)
417
- spreadsheet (0.9.6)
421
+ spreadsheet (0.9.7)
418
422
  ruby-ole (>= 1.0)
419
423
  sprockets (2.10.1)
420
424
  hike (~> 1.2)
421
425
  multi_json (~> 1.0)
422
426
  rack (~> 1.0)
423
427
  tilt (~> 1.1, != 1.3.0)
424
- sprockets-rails (2.0.1)
428
+ sprockets-rails (2.1.3)
425
429
  actionpack (>= 3.0)
426
430
  activesupport (>= 3.0)
427
431
  sprockets (~> 2.8)
428
432
  sqlite3 (1.3.9)
429
433
  state_machine (1.2.0)
430
- supermodel (0.1.4)
431
- activemodel (>= 3.0.0.beta)
432
434
  tag_helper (0.0.3)
433
435
  temple (0.6.7)
434
- term-ansicolor (1.2.2)
435
- tins (~> 0.8)
436
+ term-ansicolor (1.3.0)
437
+ tins (~> 1.0)
436
438
  thor (0.19.1)
437
- thread_safe (0.3.3)
439
+ thread_safe (0.3.4)
438
440
  tilt (1.4.1)
439
441
  timers (1.1.0)
440
- tins (0.13.1)
441
- to_xls (1.5.2)
442
+ tins (1.3.0)
443
+ to_xls (1.5.3)
442
444
  spreadsheet
443
445
  treetop (1.4.15)
444
446
  polyglot
445
447
  polyglot (>= 0.3.1)
446
- tzinfo (0.3.39)
447
- uglifier (2.4.0)
448
+ tzinfo (1.2.1)
449
+ thread_safe (~> 0.1)
450
+ uglifier (2.5.0)
448
451
  execjs (>= 0.3.0)
449
452
  json (>= 1.8.0)
450
- unicorn (4.7.0)
453
+ unicorn (4.8.3)
451
454
  kgio (~> 2.6)
452
455
  rack
453
456
  raindrops (~> 0.7)
454
457
  valuable (0.9.8)
455
- video_info (2.0.2)
458
+ video_info (2.3.1)
456
459
  addressable
457
460
  htmlentities
458
461
  multi_json
459
462
  warden (1.2.3)
460
463
  rack (>= 1.0)
461
464
  websocket (1.0.7)
462
- websocket-driver (0.3.2)
465
+ websocket-driver (0.3.3)
463
466
  weekdays (1.0.2)
464
467
  xpath (2.0.0)
465
468
  nokogiri (~> 1.3)
@@ -476,7 +479,6 @@ DEPENDENCIES
476
479
  browser
477
480
  capybara (~> 2.1.0)
478
481
  carrierwave (~> 0.10.0)
479
- catarse_mailchimp!
480
482
  catarse_moip (~> 2.3.5)
481
483
  catarse_monkeymail!
482
484
  catarse_paypal_express (= 2.2.3)
@@ -492,7 +494,7 @@ DEPENDENCIES
492
494
  ezcrypto
493
495
  factory_girl_rails
494
496
  fakeweb
495
- feedzirra
497
+ feedjira
496
498
  fog (>= 1.3.1)
497
499
  foreman
498
500
  formtastic (~> 2.2.1)
@@ -521,7 +523,7 @@ DEPENDENCIES
521
523
  protected_attributes (~> 1.0.5)
522
524
  pry
523
525
  pundit
524
- rails (= 4.0.3)
526
+ rails (~> 4.1.1)
525
527
  rails-observers (~> 0.1.2)
526
528
  rails_12factor
527
529
  ranked-model
data/app/models/catarse_monkeymail/user_concern.rb CHANGED
@@ -5,16 +5,16 @@ module CatarseMonkeymail::UserConcern
5
5
 
6
6
  before_save do
7
7
  if self.newsletter_changed? && self.newsletter
8
- return subscribe_to_newsletter_list
8
+ subscribe_to_newsletter_list
9
9
  end
10
10
 
11
11
  if self.newsletter && self.email_changed? && !self.new_record?
12
12
  unsubscribe_from_newsletter_list self.email_was
13
- return subscribe_to_newsletter_list
13
+ subscribe_to_newsletter_list
14
14
  end
15
15
 
16
16
  if self.newsletter_changed? && !self.newsletter
17
- return unsubscribe_from_newsletter_list
17
+ unsubscribe_from_newsletter_list
18
18
  end
19
19
  end
20
20
 
data/lib/catarse_monkeymail/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CatarseMonkeymail
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
data/spec/spec_helper.rb CHANGED
@@ -85,14 +85,10 @@ RSpec.configure do |config|
85
85
  CatarseMonkeymail::MailchimpApi.stub(:start)
86
86
 
87
87
 
88
- CatarseMailchimp::API.stub(:subscribe).and_return(true)
89
- CatarseMailchimp::API.stub(:unsubscribe).and_return(true)
90
88
  Project.any_instance.stub(:store_image_url).and_return('http://www.store_image_url.com')
91
89
  ProjectObserver.any_instance.stub(:after_create)
92
90
  UserObserver.any_instance.stub(:after_create)
93
91
  Project.any_instance.stub(:download_video_thumbnail)
94
- CatarseMailchimp::API.stub(:subscribe)
95
- CatarseMailchimp::API.stub(:unsubscribe)
96
92
  Notification.stub(:notify)
97
93
  Notification.stub(:notify_once)
98
94
  Calendar.any_instance.stub(:fetch_events_from)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: catarse_monkeymail
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Antônio Roberto Silva
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-02 00:00:00.000000000 Z
11
+ date: 2014-06-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
103
103
  version: '0'
104
104
  requirements: []
105
105
  rubyforge_project:
106
- rubygems_version: 2.2.0
106
+ rubygems_version: 2.2.2
107
107
  signing_key:
108
108
  specification_version: 4
109
109
  summary: Integration with the best newsletter services <3