morrigan_editor_rails 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a0eae8ce38cd5c8817d7dc24e7a7c2f5102129
-  data.tar.gz: 51faa99b399fc16eefdedb68f817aeae839f3f6f
+  metadata.gz: ac8edc84f22e2398184ec37ed538797316e03201
+  data.tar.gz: 3007dabc21d7e903903d09a2af1f3ac3aea46265
 SHA512:
-  metadata.gz: eb6e832d2dce3460c53bc2792a02c630e02a03216d164afae98db6330b2ccd93b495b4eb904da325fa4946428010798f84e70398308e9b8023fe7ed9b29e87c2
-  data.tar.gz: a9e54a095936f52169fba97d1e5019845483ad7f76a6df39d57cc5a89ff10f9e439f5ccd15fbe460178976ae63ede024022a31c0e07a80107482d6e88d747286
+  metadata.gz: 6bd2f03e4fd570c2f48ea5d6dff607d366cbe1c37e234fad8dd0ba4b107b1c7b2606b64992cb216e3072a338a7d103e8cc45208090bfda6998be83f3ed3c84b7
+  data.tar.gz: 28bf333746a840f3c102580b2222b02fde1b92cae28fa6c80a47a646d83d927857b8603e56089383a8b24f7196b1ed6d0924e2d6792f7cb50c42afc1160e826f

data/lib/morrigan_editor_rails/version.rb

@@ -1,3 +1,3 @@
 module MorriganEditorRails
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/morrigan_editor_rails.rb

@@ -18,24 +18,19 @@ module MorriganEditorRails
     end
 
     def self.sanitize_config
-      {
-          :elements => WHITELIST_ELEMENTS,
+      relaxed_conf = Sanitize::Config::RELAXED
+      relaxed_conf.merge({
+          elements: (WHITELIST_ELEMENTS + relaxed_conf[:elements]).uniq,
 
-          :attributes => {
-              'a' => ['href'],
-              'p' => ['style'],
-              'img' => ['src', 'style'],
-              'iframe' => ['width', 'height', 'src', 'frameborder', 'allowfullscreen', 'wmode', 'style'],
-              'div' => ['style', 'contenteditable', 'class'],
-              'h2' => ['style'],
-              'h3' => ['style'],
-              'h4' => ['style']
-          },
+          attributes: merge(relaxed_conf[:attributes],
+            'iframe' => ['width', 'height', 'src', 'frameborder', 'allowfullscreen', 'wmode', 'style'],
+            'div' => ['contenteditable', 'class']
+          ),
 
-          :protocols => {
-              'a' => {'href' => ['http', 'https', 'mailto', 'ftp']}
-          }
-      }
+          protocols: merge(relaxed_conf[:protocols],
+            'a' => {'href' => ['http', 'https', 'mailto', 'ftp']}
+          )
+      })
     end
 
     def self.preview_sanitize_config

data/test/dummy/app/views/test/index.html.erb

@@ -1,5 +1,6 @@
 <!--<%= asset_path('morrigan_editor_rails/iframe.css') %>-->
 <%= MorriganEditorRails::Editor.preview_sanitize '<h2>asd</h2><p><b><a href="http://foo.com/">foo</a></b><img src="bar.jpg">' %>
+<%= MorriganEditorRails::Editor.sanitize '<h2>asd</h2><p><b><a href="http://foo.com/">foo</a></b><img src="bar.jpg">' %>
 <form id="form">
     <div class="has-error"><textarea id="textarea"><p>ads</p><p>fgh</p></textarea></div>
     <div morrigan-editor="true" id="editor" editor-width="100%" editor-height="300px" editor-bound-textarea="#textarea"></div>

data/test/dummy/log/development.log

@@ -11969,3 +11969,243 @@ Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-07-28 15:42:19 +04
 
 
 Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-07-28 15:42:19 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (0.9ms)
+Completed 200 OK in 6ms (Views: 5.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 12:48:12 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (1.8ms)
+Completed 200 OK in 12ms (Views: 12.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:16 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 12:48:17 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 12:48:17 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (2.1ms)
+Completed 200 OK in 9ms (Views: 8.4ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 12:48:50 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (1.5ms)
+Completed 200 OK in 7ms (Views: 6.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 12:49:01 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (1.4ms)
+Completed 200 OK in 7ms (Views: 6.9ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 13:16:44 +0400

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morrigan_editor_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Sergey Sokolov