newsly 0.5.2 → 0.5.3

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.
Files changed (6) hide show
  1. data/app/models/newsly/template.rb +14 -4
  2. data/app/views/newsly/templates/index.html.erb +1 -1
  3. data/app/views/newsly/templates/show.html.erb +1 -1
  4. data/db/migrate/20120201175314_add_validation_rules.rb +5 -0
  5. data/lib/newsly/version.rb +1 -1
  6. metadata +89 -28
data/app/models/newsly/template.rb CHANGED
@@ -8,7 +8,7 @@ module Newsly
8
8
  validates_presence_of :subject
9
9
  #validates_presence_of :parent_id, :if => :original
10
10
  #validates original is never draft and
11
-
11
+ validate :body_must_follow_validation_rules
12
12
 
13
13
  ### Methods
14
14
 
@@ -22,6 +22,16 @@ module Newsly
22
22
  original.save
23
23
  original
24
24
  end
25
-
26
- end
27
- end
25
+
26
+ def body_must_follow_validation_rules
27
+ failed = []
28
+ unless validation_rules.blank?
29
+ validation_rules.split(',').each do |rule|
30
+ rule = rule.strip
31
+ failed.push(rule) unless body=~ /{{rule}}/
32
+ end
33
+ errors.add(:body, "#{failed.to_sentence} is required") if failed.length > 0
34
+ end
35
+ end
36
+ end
37
+ end
data/app/views/newsly/templates/index.html.erb CHANGED
@@ -21,7 +21,7 @@
21
21
  <td class="title">
22
22
  <%= link_to template.friendly_name || template.name, template, :class => "friendly_name" %>
23
23
  <span class="type"><%=t(template.template_type)%></span>
24
- <span class="desc">Lorem ipsum dolor sit amet conseqteur dolor amet.</span>
24
+ <span class="desc"><%=t(template.description)%></span>
25
25
  </td>
26
26
  </tr>
27
27
  <% end %>
data/app/views/newsly/templates/show.html.erb CHANGED
@@ -16,4 +16,4 @@
16
16
  <div id="saved"></div>
17
17
  </div>
18
18
 
19
- <%= javascript_include_tag "/mercury/javascripts/mercury_loader.js", "templates" %>
19
+ <%= javascript_include_tag "templates", "/mercury/javascripts/mercury_loader.js" %>
data/db/migrate/20120201175314_add_validation_rules.rb ADDED
@@ -0,0 +1,5 @@
1
+ class AddValidationRules < ActiveRecord::Migration
2
+ def change
3
+ add_column :newsly_templates, :validation_rules, :text
4
+ end
5
+ end
data/lib/newsly/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Newsly
2
- VERSION = "0.5.2"
2
+ VERSION = "0.5.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: newsly
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.2
4
+ version: 0.5.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,22 +10,27 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-01-30 00:00:00.000000000 Z
13
+ date: 2012-03-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &70133490220020 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
21
21
  - !ruby/object:Gem::Version
22
- version: 3.1.0
22
+ version: 3.2.1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70133490220020
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ! '>='
29
+ - !ruby/object:Gem::Version
30
+ version: 3.2.1
26
31
  - !ruby/object:Gem::Dependency
27
32
  name: resque
28
- requirement: &70133490218380 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
29
34
  none: false
30
35
  requirements:
31
36
  - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
33
38
  version: '0'
34
39
  type: :runtime
35
40
  prerelease: false
36
- version_requirements: *70133490218380
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
37
47
  - !ruby/object:Gem::Dependency
38
48
  name: liquid
39
- requirement: &70133490217240 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
40
50
  none: false
41
51
  requirements:
42
52
  - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
44
54
  version: '0'
45
55
  type: :runtime
46
56
  prerelease: false
47
- version_requirements: *70133490217240
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
48
63
  - !ruby/object:Gem::Dependency
49
64
  name: jquery-rails
50
- requirement: &70133490214960 !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
51
66
  none: false
52
67
  requirements:
53
68
  - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
55
70
  version: '0'
56
71
  type: :runtime
57
72
  prerelease: false
58
- version_requirements: *70133490214960
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
59
79
  - !ruby/object:Gem::Dependency
60
80
  name: resque-async_deliver
61
- requirement: &70133490210820 !ruby/object:Gem::Requirement
81
+ requirement: !ruby/object:Gem::Requirement
62
82
  none: false
63
83
  requirements:
64
84
  - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
66
86
  version: '0'
67
87
  type: :runtime
68
88
  prerelease: false
69
- version_requirements: *70133490210820
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
70
95
  - !ruby/object:Gem::Dependency
71
96
  name: sqlite3
72
- requirement: &70133490206260 !ruby/object:Gem::Requirement
97
+ requirement: !ruby/object:Gem::Requirement
73
98
  none: false
74
99
  requirements:
75
100
  - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
77
102
  version: '0'
78
103
  type: :development
79
104
  prerelease: false
80
- version_requirements: *70133490206260
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
81
111
  - !ruby/object:Gem::Dependency
82
112
  name: letter_opener
83
- requirement: &70133490205040 !ruby/object:Gem::Requirement
113
+ requirement: !ruby/object:Gem::Requirement
84
114
  none: false
85
115
  requirements:
86
116
  - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
88
118
  version: '0'
89
119
  type: :development
90
120
  prerelease: false
91
- version_requirements: *70133490205040
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ! '>='
125
+ - !ruby/object:Gem::Version
126
+ version: '0'
92
127
  - !ruby/object:Gem::Dependency
93
128
  name: unicorn
94
- requirement: &70133490204060 !ruby/object:Gem::Requirement
129
+ requirement: !ruby/object:Gem::Requirement
95
130
  none: false
96
131
  requirements:
97
132
  - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
99
134
  version: '0'
100
135
  type: :development
101
136
  prerelease: false
102
- version_requirements: *70133490204060
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ! '>='
141
+ - !ruby/object:Gem::Version
142
+ version: '0'
103
143
  - !ruby/object:Gem::Dependency
104
144
  name: rspec-rails
105
- requirement: &70133490203280 !ruby/object:Gem::Requirement
145
+ requirement: !ruby/object:Gem::Requirement
106
146
  none: false
107
147
  requirements:
108
148
  - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
110
150
  version: '0'
111
151
  type: :development
112
152
  prerelease: false
113
- version_requirements: *70133490203280
153
+ version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
155
+ requirements:
156
+ - - ! '>='
157
+ - !ruby/object:Gem::Version
158
+ version: '0'
114
159
  - !ruby/object:Gem::Dependency
115
160
  name: capybara
116
- requirement: &70133490202460 !ruby/object:Gem::Requirement
161
+ requirement: !ruby/object:Gem::Requirement
117
162
  none: false
118
163
  requirements:
119
164
  - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
121
166
  version: '0'
122
167
  type: :development
123
168
  prerelease: false
124
- version_requirements: *70133490202460
169
+ version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
171
+ requirements:
172
+ - - ! '>='
173
+ - !ruby/object:Gem::Version
174
+ version: '0'
125
175
  - !ruby/object:Gem::Dependency
126
176
  name: capybara-webkit
127
- requirement: &70133490201280 !ruby/object:Gem::Requirement
177
+ requirement: !ruby/object:Gem::Requirement
128
178
  none: false
129
179
  requirements:
130
180
  - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
132
182
  version: '0'
133
183
  type: :development
134
184
  prerelease: false
135
- version_requirements: *70133490201280
185
+ version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
187
+ requirements:
188
+ - - ! '>='
189
+ - !ruby/object:Gem::Version
190
+ version: '0'
136
191
  - !ruby/object:Gem::Dependency
137
192
  name: database_cleaner
138
- requirement: &70133490198440 !ruby/object:Gem::Requirement
193
+ requirement: !ruby/object:Gem::Requirement
139
194
  none: false
140
195
  requirements:
141
196
  - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
143
198
  version: '0'
144
199
  type: :development
145
200
  prerelease: false
146
- version_requirements: *70133490198440
201
+ version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
203
+ requirements:
204
+ - - ! '>='
205
+ - !ruby/object:Gem::Version
206
+ version: '0'
147
207
  description: Manage mailer templates via wysiwyg and liquid. Uses mercury editor for
148
208
  now. And send out newsletters.
149
209
  email:
@@ -182,6 +242,7 @@ files:
182
242
  - db/migrate/20111004085523_add_fields_to_newsletter.rb
183
243
  - db/migrate/20111025072740_add_friendly_fields_to_templates.rb
184
244
  - db/migrate/20111025132457_add_template_column.rb
245
+ - db/migrate/20120201175314_add_validation_rules.rb
185
246
  - lib/newsly/engine.rb
186
247
  - lib/newsly/version.rb
187
248
  - lib/newsly.rb
@@ -218,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
218
279
  version: '0'
219
280
  requirements: []
220
281
  rubyforge_project:
221
- rubygems_version: 1.8.15
282
+ rubygems_version: 1.8.18
222
283
  signing_key:
223
284
  specification_version: 3
224
285
  summary: Manage mailer templates via wysiwyg and liquid. And send out newsletters.