redditor 0.1.10 → 0.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +0 -2
  3. data/Gemfile +2 -1
  4. data/README.md +17 -3
  5. data/app/assets/images/redditor/big/image.png +0 -0
  6. data/app/assets/images/redditor/big/slider.png +0 -0
  7. data/app/assets/images/redditor/big/text.png +0 -0
  8. data/app/assets/images/redditor/big/video.png +0 -0
  9. data/app/assets/javascripts/redditor/init.coffee +149 -0
  10. data/app/assets/javascripts/{fileapi → redditor}/uploader.coffee +18 -18
  11. data/app/assets/javascripts/redditor.js.coffee +3 -0
  12. data/app/assets/stylesheets/{redditor/redditor.css.scss → redditor.scss} +70 -24
  13. data/app/controllers/redditor/admin/image_blocks_controller.rb +4 -4
  14. data/app/controllers/redditor/admin/images_controller.rb +1 -1
  15. data/app/controllers/redditor/admin/slider_blocks_controller.rb +3 -3
  16. data/app/controllers/redditor/admin/text_blocks_controller.rb +3 -3
  17. data/app/controllers/redditor/admin/video_blocks_controller.rb +3 -3
  18. data/app/helpers/redditor/application_helper.rb +7 -0
  19. data/app/views/redditor/admin/_content_block.haml +35 -0
  20. data/app/views/redditor/admin/{pages/_image.haml → _image.haml} +5 -5
  21. data/app/views/redditor/admin/{pages/_page.haml → _page.haml} +2 -3
  22. data/app/views/redditor/admin/_slider_block.haml +16 -0
  23. data/app/views/redditor/admin/{pages/_slider_block_image.haml → _slider_block_image.haml} +0 -0
  24. data/app/views/redditor/admin/_text_block.haml +5 -0
  25. data/app/views/redditor/admin/{pages/_validate.haml → _validate.haml} +1 -1
  26. data/app/views/redditor/admin/{pages/_video_block.haml → _video_block.haml} +2 -2
  27. data/app/views/redditor/admin/_wrapper.haml +3 -0
  28. data/app/views/redditor/admin/new.js.erb +5 -0
  29. data/app/views/redditor/admin/slider_block_image.js.coffee +2 -0
  30. data/app/views/redditor/admin/wrapper.js.coffee +5 -0
  31. data/app/views/redditor/images/_image.html.haml +1 -1
  32. data/app/views/redditor/slider_blocks/_slider_block_image.html.haml +1 -1
  33. data/config/locales/redditor.ru.yml +1 -1
  34. data/lib/redditor/engine.rb +1 -2
  35. data/lib/redditor/version.rb +1 -1
  36. data/redditor.gemspec +2 -9
  37. data/spec/dummy/app/assets/images/redactor/icons.png +0 -0
  38. data/spec/dummy/app/assets/images/redactor/plugins/file.html +3 -0
  39. data/spec/dummy/app/assets/images/redactor/plugins/image.html +39 -0
  40. data/spec/dummy/app/assets/images/redactor/plugins/image_edit.html +35 -0
  41. data/spec/dummy/app/assets/images/redactor/plugins/link.html +74 -0
  42. data/spec/dummy/app/assets/images/redactor/plugins/table.html +25 -0
  43. data/spec/dummy/app/assets/images/redactor/plugins/video.html +15 -0
  44. data/spec/dummy/app/assets/javascripts/application.js +10 -2
  45. data/spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js +521 -0
  46. data/spec/dummy/app/assets/javascripts/redactor/langs/en.js +76 -0
  47. data/spec/dummy/app/assets/javascripts/redactor/langs/ru.js +75 -0
  48. data/spec/dummy/app/assets/javascripts/redactor/redactor.js.erb +2248 -0
  49. data/spec/dummy/app/assets/javascripts/redactor/toolbars/default.js +219 -0
  50. data/{app/assets/stylesheets/redditor → spec/dummy/app/assets/stylesheets}/application.css.scss +3 -8
  51. data/spec/dummy/app/assets/stylesheets/redactor/redactor.css.scss +369 -0
  52. data/spec/dummy/app/assets/stylesheets/redactor/wym.css +136 -0
  53. data/spec/dummy/app/controllers/articles_controller.rb +9 -0
  54. data/spec/dummy/app/views/admin/articles/edit.html.haml +1 -1
  55. data/spec/dummy/app/views/articles/show.html.haml +1 -1
  56. data/spec/dummy/app/views/layouts/application.html.erb +1 -1
  57. data/spec/features/text_spec.rb +3 -3
  58. data/spec/generators/views_generator_spec.rb +1 -1
  59. metadata +57 -114
  60. data/app/assets/javascripts/jquery-ui.min.js +0 -12
  61. data/app/assets/javascripts/redditor/application.js +0 -14
  62. data/app/assets/javascripts/redditor/redditor.coffee +0 -151
  63. data/app/helpers/redditor/fileapi_helper.rb +0 -17
  64. data/app/helpers/redditor/pages_helper.rb +0 -24
  65. data/app/models/redditor/content_block.rb +0 -24
  66. data/app/views/redditor/admin/pages/_content_block.haml +0 -37
  67. data/app/views/redditor/admin/pages/_slider_block.haml +0 -16
  68. data/app/views/redditor/admin/pages/_text_block.haml +0 -5
  69. data/app/views/redditor/admin/pages/_wrap_dd.haml +0 -1
  70. data/app/views/redditor/admin/pages/_wrapper.haml +0 -3
  71. data/app/views/redditor/admin/pages/new.js.coffee +0 -7
  72. data/app/views/redditor/admin/pages/new.js.erb +0 -7
  73. data/app/views/redditor/admin/pages/slider_block_image.js.coffee +0 -2
  74. data/app/views/redditor/admin/pages/wrapper.js.coffee +0 -6
  75. data/spec/dummy/app/assets/stylesheets/application.css +0 -13
data/spec/dummy/app/assets/stylesheets/redactor/wym.css ADDED
@@ -0,0 +1,136 @@
1
+
2
+ body {
3
+ font-family: "PT Sans", "Trebuchet MS", Verdana, Arial, Tahoma, sans-serif;
4
+ font-size: 14px;
5
+ margin: 0;
6
+ padding: 0;
7
+ overflow-x: hidden;
8
+ background-color: #f8f8f8;
9
+ }
10
+
11
+ #page {
12
+ margin: 20px;
13
+ background: #f8f8f8;
14
+ border: none;
15
+ padding: 0;
16
+ }
17
+ #page:focus {
18
+ outline: none;
19
+ }
20
+
21
+
22
+ div,
23
+ p,
24
+ ul,
25
+ ol,
26
+ table,
27
+ dl,
28
+ pre,
29
+ h1,
30
+ h2,
31
+ h3,
32
+ h4,
33
+ h5,
34
+ blockquote {
35
+ background-color: #fff;
36
+ border: 1px solid #ebebeb;
37
+ padding: 10px;
38
+ margin: 10px 0;
39
+ }
40
+
41
+ p ul,
42
+ p ol {
43
+ margin: 0;
44
+ padding: 0;
45
+ border: none;
46
+ }
47
+
48
+ div,
49
+ p,
50
+ ul,
51
+ ol,
52
+ table,
53
+ dl,
54
+ blockquote,
55
+ pre,
56
+ iframe,
57
+ object,
58
+ hr {
59
+ margin-bottom: 15px;
60
+ line-height: 1.5em;
61
+ }
62
+ blockquote {
63
+ margin-left: 3em;
64
+ font-style: italic;
65
+ color: #777;
66
+ }
67
+ div {
68
+ background-color: #fff;
69
+ border: 1px dashed #ebebeb;
70
+ }
71
+ ul, ol {
72
+ padding-left: 2em !important;
73
+ }
74
+ ul ul,
75
+ ol ol,
76
+ ul ol,
77
+ ol ul {
78
+ border: none;
79
+ margin: 2px !important;
80
+ padding: 0;
81
+ padding-left: 2em;
82
+ }
83
+ dl dt { font-weight: bold; }
84
+ dd { margin-left: 1em;}
85
+
86
+ table {
87
+ border-collapse: collapse;
88
+ font-size: 1em;
89
+ }
90
+ table td {
91
+ border: 1px solid #ddd;
92
+ padding: 5px;
93
+ }
94
+ table thead td {
95
+ border-bottom: 2px solid #000 !important;
96
+ font-weight: bold;
97
+ }
98
+ code, pre {
99
+ font-family: monospace sans-serif;
100
+ }
101
+ code {
102
+ background-color: #d8d7d7;
103
+ }
104
+ pre {
105
+ padding: 1em;
106
+ border: 1px dashed #ccc;
107
+ background: #f5f5f5;
108
+ overflow: auto;
109
+ }
110
+ hr {
111
+ display: block;
112
+ height: 1px;
113
+ border: 0;
114
+ border-top: 1px solid #ccc;
115
+ }
116
+
117
+ h1, h2, h3, h4,h5 {
118
+ font-weight: bold;
119
+ margin-bottom: 10px;
120
+ }
121
+
122
+ h1 {
123
+ font-size: 36px;
124
+ }
125
+ h2 {
126
+ font-size: 30px;
127
+ }
128
+ h3 {
129
+ font-size: 24px;
130
+ }
131
+ h4 {
132
+ font-size: 18px;
133
+ }
134
+ h4 {
135
+ font-size: 1em;
136
+ }
data/spec/dummy/app/controllers/articles_controller.rb ADDED
@@ -0,0 +1,9 @@
1
+ # coding: utf-8
2
+
3
+ class ArticlesController < ApplicationController
4
+
5
+ def show
6
+ @article = Article.find(params[:id])
7
+ end
8
+
9
+ end
data/spec/dummy/app/views/admin/articles/edit.html.haml CHANGED
@@ -8,5 +8,5 @@
8
8
  = f.label :title
9
9
  = f.text_field :title
10
10
 
11
- %div= render "redditor/admin/pages/page", {f: f}
11
+ %div= render "redditor/admin/page", {f: f}
12
12
  = f.submit "Submit"
data/spec/dummy/app/views/articles/show.html.haml CHANGED
@@ -1,2 +1,2 @@
1
1
  %h1= @article.title
2
- =render @article.page
2
+ = render @article.page
data/spec/dummy/app/views/layouts/application.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Dummy</title>
5
- <%= stylesheet_link_tag "redditor/application", media: "all" %>
5
+ <%= stylesheet_link_tag "application", media: "all" %>
6
6
  <%= javascript_include_tag "application" %>
7
7
  <%= yield :js %>
8
8
  <%= csrf_meta_tags %>
data/spec/features/text_spec.rb CHANGED
@@ -18,9 +18,9 @@ describe "Text block" do
18
18
 
19
19
  it "Saves text block to article", type: :feature, js: true do
20
20
  add_block
21
- page.find(".text-block-input").set("test text block")
21
+ page.find("textarea").set("test text block")
22
22
  submit
23
- expect(page.find("textarea").value).to eq "test text block"
23
+ expect(page).to have_content "test text block"
24
24
  end
25
25
 
26
26
  it "Shows validation error if text block content is empty", type: :feature, js: true do
@@ -45,7 +45,7 @@ describe "Text block" do
45
45
 
46
46
  it "Saves text block to article on save button", type: :feature, js: true do
47
47
  add_block
48
- page.find(".text-block-input").set("test text block")
48
+ page.find("textarea").set("test text block")
49
49
  save_block
50
50
  visit_article
51
51
  expect(page.find("textarea").value).to eq "test text block"
data/spec/generators/views_generator_spec.rb CHANGED
@@ -14,7 +14,7 @@ describe Redditor::Generators::ViewsGenerator do
14
14
  after(:all) { FileUtils.rm_rf 'tmp' }
15
15
 
16
16
  it "generates views" do
17
- assert_directory "app/views/redditor/admin/pages/_content_block.haml"
17
+ assert_directory "app/views/redditor/pages/_page.html.haml"
18
18
  end
19
19
 
20
20
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redditor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.10
4
+ version: 0.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Oleg Bovykin
@@ -9,106 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-14 00:00:00.000000000 Z
12
+ date: 2014-01-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: !ruby/object:Gem::Requirement
17
- requirements:
18
- - - ~>
19
- - !ruby/object:Gem::Version
20
- version: 4.0.0
21
- type: :runtime
22
- prerelease: false
23
- version_requirements: !ruby/object:Gem::Requirement
24
- requirements:
25
- - - ~>
26
- - !ruby/object:Gem::Version
27
- version: 4.0.0
28
- - !ruby/object:Gem::Dependency
29
- name: haml
30
- requirement: !ruby/object:Gem::Requirement
31
- requirements:
32
- - - '>='
33
- - !ruby/object:Gem::Version
34
- version: '0'
35
- type: :runtime
36
- prerelease: false
37
- version_requirements: !ruby/object:Gem::Requirement
38
- requirements:
39
- - - '>='
40
- - !ruby/object:Gem::Version
41
- version: '0'
42
- - !ruby/object:Gem::Dependency
43
- name: carrierwave
44
- requirement: !ruby/object:Gem::Requirement
45
- requirements:
46
- - - '>='
47
- - !ruby/object:Gem::Version
48
- version: '0'
49
- type: :runtime
50
- prerelease: false
51
- version_requirements: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - '>='
54
- - !ruby/object:Gem::Version
55
- version: '0'
56
- - !ruby/object:Gem::Dependency
57
- name: rmagick
58
- requirement: !ruby/object:Gem::Requirement
59
- requirements:
60
- - - '>='
61
- - !ruby/object:Gem::Version
62
- version: '0'
63
- type: :runtime
64
- prerelease: false
65
- version_requirements: !ruby/object:Gem::Requirement
66
- requirements:
67
- - - '>='
68
- - !ruby/object:Gem::Version
69
- version: '0'
70
- - !ruby/object:Gem::Dependency
71
- name: coffee-rails
72
- requirement: !ruby/object:Gem::Requirement
73
- requirements:
74
- - - '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
77
- type: :runtime
78
- prerelease: false
79
- version_requirements: !ruby/object:Gem::Requirement
80
- requirements:
81
- - - '>='
82
- - !ruby/object:Gem::Version
83
- version: '0'
84
- - !ruby/object:Gem::Dependency
85
- name: jquery-rails
86
16
  requirement: !ruby/object:Gem::Requirement
87
17
  requirements:
88
18
  - - '>='
89
19
  - !ruby/object:Gem::Version
90
- version: '0'
20
+ version: 4.0.0
91
21
  type: :runtime
92
22
  prerelease: false
93
23
  version_requirements: !ruby/object:Gem::Requirement
94
24
  requirements:
95
25
  - - '>='
96
26
  - !ruby/object:Gem::Version
97
- version: '0'
98
- - !ruby/object:Gem::Dependency
99
- name: jquery-rails
100
- requirement: !ruby/object:Gem::Requirement
101
- requirements:
102
- - - '>='
103
- - !ruby/object:Gem::Version
104
- version: '0'
105
- type: :development
106
- prerelease: false
107
- version_requirements: !ruby/object:Gem::Requirement
108
- requirements:
109
- - - '>='
110
- - !ruby/object:Gem::Version
111
- version: '0'
27
+ version: 4.0.0
112
28
  - !ruby/object:Gem::Dependency
113
29
  name: capybara
114
30
  requirement: !ruby/object:Gem::Requirement
@@ -247,16 +163,18 @@ files:
247
163
  - app/assets/images/redditor/add_txt_big.png
248
164
  - app/assets/images/redditor/add_video.png
249
165
  - app/assets/images/redditor/add_video_big.png
166
+ - app/assets/images/redditor/big/image.png
167
+ - app/assets/images/redditor/big/slider.png
168
+ - app/assets/images/redditor/big/text.png
169
+ - app/assets/images/redditor/big/video.png
250
170
  - app/assets/images/redditor/destroy_block_text.png
251
171
  - app/assets/images/redditor/move_handler.png
252
172
  - app/assets/images/redditor/no_format_text.png
253
173
  - app/assets/images/redditor/trash.png
254
- - app/assets/javascripts/fileapi/uploader.coffee
255
- - app/assets/javascripts/jquery-ui.min.js
256
- - app/assets/javascripts/redditor/application.js
257
- - app/assets/javascripts/redditor/redditor.coffee
258
- - app/assets/stylesheets/redditor/application.css.scss
259
- - app/assets/stylesheets/redditor/redditor.css.scss
174
+ - app/assets/javascripts/redditor.js.coffee
175
+ - app/assets/javascripts/redditor/init.coffee
176
+ - app/assets/javascripts/redditor/uploader.coffee
177
+ - app/assets/stylesheets/redditor.scss
260
178
  - app/controllers/redditor/admin/base_controller.rb
261
179
  - app/controllers/redditor/admin/image_blocks_controller.rb
262
180
  - app/controllers/redditor/admin/images_controller.rb
@@ -266,9 +184,6 @@ files:
266
184
  - app/controllers/redditor/admin/video_blocks_controller.rb
267
185
  - app/controllers/redditor/application_controller.rb
268
186
  - app/helpers/redditor/application_helper.rb
269
- - app/helpers/redditor/fileapi_helper.rb
270
- - app/helpers/redditor/pages_helper.rb
271
- - app/models/redditor/content_block.rb
272
187
  - app/models/redditor/image.rb
273
188
  - app/models/redditor/page.rb
274
189
  - app/models/redditor/slider_block.rb
@@ -276,20 +191,18 @@ files:
276
191
  - app/models/redditor/video_block.rb
277
192
  - app/uploaders/redditor_uploader.rb
278
193
  - app/views/layouts/redditor/application.html.erb
279
- - app/views/redditor/admin/pages/_content_block.haml
280
- - app/views/redditor/admin/pages/_image.haml
281
- - app/views/redditor/admin/pages/_page.haml
282
- - app/views/redditor/admin/pages/_slider_block.haml
283
- - app/views/redditor/admin/pages/_slider_block_image.haml
284
- - app/views/redditor/admin/pages/_text_block.haml
285
- - app/views/redditor/admin/pages/_validate.haml
286
- - app/views/redditor/admin/pages/_video_block.haml
287
- - app/views/redditor/admin/pages/_wrap_dd.haml
288
- - app/views/redditor/admin/pages/_wrapper.haml
289
- - app/views/redditor/admin/pages/new.js.coffee
290
- - app/views/redditor/admin/pages/new.js.erb
291
- - app/views/redditor/admin/pages/slider_block_image.js.coffee
292
- - app/views/redditor/admin/pages/wrapper.js.coffee
194
+ - app/views/redditor/admin/_content_block.haml
195
+ - app/views/redditor/admin/_image.haml
196
+ - app/views/redditor/admin/_page.haml
197
+ - app/views/redditor/admin/_slider_block.haml
198
+ - app/views/redditor/admin/_slider_block_image.haml
199
+ - app/views/redditor/admin/_text_block.haml
200
+ - app/views/redditor/admin/_validate.haml
201
+ - app/views/redditor/admin/_video_block.haml
202
+ - app/views/redditor/admin/_wrapper.haml
203
+ - app/views/redditor/admin/new.js.erb
204
+ - app/views/redditor/admin/slider_block_image.js.coffee
205
+ - app/views/redditor/admin/wrapper.js.coffee
293
206
  - app/views/redditor/images/_image.html.haml
294
207
  - app/views/redditor/pages/_page.html.haml
295
208
  - app/views/redditor/slider_blocks/_slider_block.html.haml
@@ -316,11 +229,26 @@ files:
316
229
  - spec/dummy/README.rdoc
317
230
  - spec/dummy/Rakefile
318
231
  - spec/dummy/app/assets/images/.keep
232
+ - spec/dummy/app/assets/images/redactor/icons.png
233
+ - spec/dummy/app/assets/images/redactor/plugins/file.html
234
+ - spec/dummy/app/assets/images/redactor/plugins/image.html
235
+ - spec/dummy/app/assets/images/redactor/plugins/image_edit.html
236
+ - spec/dummy/app/assets/images/redactor/plugins/link.html
237
+ - spec/dummy/app/assets/images/redactor/plugins/table.html
238
+ - spec/dummy/app/assets/images/redactor/plugins/video.html
319
239
  - spec/dummy/app/assets/javascripts/application.js
320
- - spec/dummy/app/assets/stylesheets/application.css
240
+ - spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js
241
+ - spec/dummy/app/assets/javascripts/redactor/langs/en.js
242
+ - spec/dummy/app/assets/javascripts/redactor/langs/ru.js
243
+ - spec/dummy/app/assets/javascripts/redactor/redactor.js.erb
244
+ - spec/dummy/app/assets/javascripts/redactor/toolbars/default.js
245
+ - spec/dummy/app/assets/stylesheets/application.css.scss
246
+ - spec/dummy/app/assets/stylesheets/redactor/redactor.css.scss
247
+ - spec/dummy/app/assets/stylesheets/redactor/wym.css
321
248
  - spec/dummy/app/controllers/admin/articles_controller.rb
322
249
  - spec/dummy/app/controllers/admin/base_controller.rb
323
250
  - spec/dummy/app/controllers/application_controller.rb
251
+ - spec/dummy/app/controllers/articles_controller.rb
324
252
  - spec/dummy/app/controllers/concerns/.keep
325
253
  - spec/dummy/app/helpers/application_helper.rb
326
254
  - spec/dummy/app/mailers/.keep
@@ -391,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
391
319
  version: '0'
392
320
  requirements: []
393
321
  rubyforge_project:
394
- rubygems_version: 2.0.6
322
+ rubygems_version: 2.0.3
395
323
  signing_key:
396
324
  specification_version: 4
397
325
  summary: Page editor
@@ -400,11 +328,26 @@ test_files:
400
328
  - spec/dummy/README.rdoc
401
329
  - spec/dummy/Rakefile
402
330
  - spec/dummy/app/assets/images/.keep
331
+ - spec/dummy/app/assets/images/redactor/icons.png
332
+ - spec/dummy/app/assets/images/redactor/plugins/file.html
333
+ - spec/dummy/app/assets/images/redactor/plugins/image.html
334
+ - spec/dummy/app/assets/images/redactor/plugins/image_edit.html
335
+ - spec/dummy/app/assets/images/redactor/plugins/link.html
336
+ - spec/dummy/app/assets/images/redactor/plugins/table.html
337
+ - spec/dummy/app/assets/images/redactor/plugins/video.html
403
338
  - spec/dummy/app/assets/javascripts/application.js
404
- - spec/dummy/app/assets/stylesheets/application.css
339
+ - spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js
340
+ - spec/dummy/app/assets/javascripts/redactor/langs/en.js
341
+ - spec/dummy/app/assets/javascripts/redactor/langs/ru.js
342
+ - spec/dummy/app/assets/javascripts/redactor/redactor.js.erb
343
+ - spec/dummy/app/assets/javascripts/redactor/toolbars/default.js
344
+ - spec/dummy/app/assets/stylesheets/application.css.scss
345
+ - spec/dummy/app/assets/stylesheets/redactor/redactor.css.scss
346
+ - spec/dummy/app/assets/stylesheets/redactor/wym.css
405
347
  - spec/dummy/app/controllers/admin/articles_controller.rb
406
348
  - spec/dummy/app/controllers/admin/base_controller.rb
407
349
  - spec/dummy/app/controllers/application_controller.rb
350
+ - spec/dummy/app/controllers/articles_controller.rb
408
351
  - spec/dummy/app/controllers/concerns/.keep
409
352
  - spec/dummy/app/helpers/application_helper.rb
410
353
  - spec/dummy/app/mailers/.keep