morrigan_editor_rails 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac8edc84f22e2398184ec37ed538797316e03201
-  data.tar.gz: 3007dabc21d7e903903d09a2af1f3ac3aea46265
+  metadata.gz: 213aa860f47ef0f027b88399c86ced7e7abe7f79
+  data.tar.gz: ea4af3ee1d455306dc5561bc45a7ec5f070f8839
 SHA512:
-  metadata.gz: 6bd2f03e4fd570c2f48ea5d6dff607d366cbe1c37e234fad8dd0ba4b107b1c7b2606b64992cb216e3072a338a7d103e8cc45208090bfda6998be83f3ed3c84b7
-  data.tar.gz: 28bf333746a840f3c102580b2222b02fde1b92cae28fa6c80a47a646d83d927857b8603e56089383a8b24f7196b1ed6d0924e2d6792f7cb50c42afc1160e826f
+  metadata.gz: 58110fcf076585a0b158c13ad7e811f0bbeaf816e5e49092572a167c4e7bd1a06e2b7a02c39936dc935bc633a93efd0eaf861ec780ced8056a54c553e8135573
+  data.tar.gz: f11a04972efab0ccd8927b5dcef6a0e3d6940ca336a5ef69d79015df3d41bbdb7a00d988aea19fb0b810bba2454f13260ae47dc3a73a31fea2f3413fce3f6496

data/lib/morrigan_editor_rails/version.rb

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

data/lib/morrigan_editor_rails.rb

@@ -22,12 +22,12 @@ module MorriganEditorRails
       relaxed_conf.merge({
           elements: (WHITELIST_ELEMENTS + relaxed_conf[:elements]).uniq,
 
-          attributes: merge(relaxed_conf[:attributes],
+          attributes: relaxed_conf[:attributes].merge(
             'iframe' => ['width', 'height', 'src', 'frameborder', 'allowfullscreen', 'wmode', 'style'],
             'div' => ['contenteditable', 'class']
           ),
 
-          protocols: merge(relaxed_conf[:protocols],
+          protocols: relaxed_conf[:protocols].merge(
             'a' => {'href' => ['http', 'https', 'mailto', 'ftp']}
           )
       })

data/test/dummy/log/development.log

@@ -12209,3 +12209,73 @@ Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 13:16:44 +04
 
 
 Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 13:16:44 +0400
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 13:32:29 +0400
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (7.2ms)
+Completed 500 Internal Server Error in 12ms
+
+ActionView::Template::Error (undefined method `merge' for MorriganEditorRails::Editor:Class):
+    1: <!--<%= asset_path('morrigan_editor_rails/iframe.css') %>-->
+    2: <%= MorriganEditorRails::Editor.preview_sanitize '<h2>asd</h2><p><b><a href="http://foo.com/">foo</a></b><img src="bar.jpg">' %>
+    3: <%= MorriganEditorRails::Editor.sanitize '<h2>asd</h2><p><b><a href="http://foo.com/">foo</a></b><img src="bar.jpg">' %>
+    4: <form id="form">
+    5:     <div class="has-error"><textarea id="textarea"><p>ads</p><p>fgh</p></textarea></div>
+    6:     <div morrigan-editor="true" id="editor" editor-width="100%" editor-height="300px" editor-bound-textarea="#textarea"></div>
+  app/views/test/index.html.erb:3:in `_app_views_test_index_html_erb___648171083_81113380'
+
+
+  Rendered /home/salkar/.rvm/gems/ruby-2.1.0/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.0ms)
+  Rendered /home/salkar/.rvm/gems/ruby-2.1.0/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (13.7ms)
+  Rendered /home/salkar/.rvm/gems/ruby-2.1.0/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb within rescues/layout (20.5ms)
+
+
+Started GET "/" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by TestController#index as HTML
+  Rendered test/index.html.erb within layouts/application (6.6ms)
+Completed 200 OK in 208ms (Views: 207.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/editor_iframe.css?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.css?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/font-awesome.css?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.css?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:49 +0400
+
+
+Started GET "/assets/jquery-ui/widget.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/main.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/morrigan-jquery-editor.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/morrigan_editor_rails/application.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/editor_iframe.css" for 127.0.0.1 at 2014-08-18 13:33:50 +0400
+
+
+Started GET "/assets/fontawesome-webfont.woff" for 127.0.0.1 at 2014-08-18 13:33:50 +0400

data/test/dummy/tmp/pids/server.pid

@@ -1 +1 @@
-2325
+8964

metadata

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