bootsy 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820e0bc4f995904c5752a2368376ee0702667cd4
-  data.tar.gz: 4e488bfa53486db0a91b52d49cb6057ccfcc65b7
+  metadata.gz: b37d916855aa7e4327004cdb3c5eb7f11199d256
+  data.tar.gz: 623f7dc9e67b1e31877b375bbbe6662954f491c5
 SHA512:
-  metadata.gz: e008a0a422e94b496932314e14100003f491724e4e7fca6588a5cff8dfbb9e8cf87f56512809aee54d7ec8ca5540d29a5ba0f1a39193681747e2641592131881
-  data.tar.gz: fae73019c6c3523bc1144af866cf4715c87c6b87d7dd86266bb14aab2517da4324119fc35ef4edeb87ed659ef38335a41f01ed89450cdde732f43175f389afe8
+  metadata.gz: 7883163157131dcb09ca23523dc4ed0039de0a9609d39b45898574e47b45ca1226b74f734235cdeb43f1ea3e65a85cd515784e6db3e150bbd23b2f78b096dc53
+  data.tar.gz: 3dbd46fcaf211a137fb00bc39f92c6eab5737c294796fbd3186a75dd22f20f7824918fb2e817e00e383c238fcdb464f171976c832d666bbe3161379c399d1132

data/README.md

@@ -6,7 +6,7 @@
 [![Code Climate](https://codeclimate.com/github/volmer/bootsy.png)](https://codeclimate.com/github/volmer/bootsy)
 [![Coverage Status](https://coveralls.io/repos/volmer/bootsy/badge.png?branch=master)](https://coveralls.io/r/volmer/bootsy)
 
-*Bootsy* is a WYSIWYG solution for Rails based on [Bootstrap-wysihtml5](https://github.com/jhollingworth/bootstrap-wysihtml5) which includes image uploads via [CarrierWave](https://github.com/carrierwaveuploader/carrierwave).
+*Bootsy* is a WYSIWYG editor for Rails based on [Bootstrap-wysihtml5](https://github.com/jhollingworth/bootstrap-wysihtml5) with image uploads using [CarrierWave](https://github.com/carrierwaveuploader/carrierwave).
 
 ### Live demo
 
@@ -19,7 +19,7 @@
 * Ruby `2` or `1.9.3`;
 * ImageMagick or GraphicsMagick (for MiniMagick);
 * Rails `4`;
-* [Bootstrap `3`](http://getbootstrap.com/) properly added to your application.
+* [Bootstrap `3`](http://getbootstrap.com/) fully installed in your app.
 
 
 ## Installation
@@ -41,7 +41,7 @@ rails generate bootsy:install
   It will include the javascripts and stylesheets in the assets pipeline,
   create the `bootsy.rb` initializer and add a copy of the english translations.
 
-4\. Add and run migrations (if you're using ActiveRecord):
+4\. Add and run migrations:
 ```console
 rake bootsy:install:migrations
 rake db:migrate
@@ -50,8 +50,8 @@ rake db:migrate
 
 ## Usage
 
-Just call the brand new method `bootsy_area` in your `FormBuilder` instances, the
-same way you'd call the basic `textarea` method. Example:
+Just call `bootsy_area` in your `FormBuilder` instances, the
+same way you'd call `textarea`. Example:
 ```erb
 <%= form_for(@post) do |f| %>
   <%= f.label :title %>
@@ -65,20 +65,20 @@ same way you'd call the basic `textarea` method. Example:
 ```
 
 Bootsy will group the uploaded images as galleries and associate them to one of
-your models. For example, if you have a `Post` model and you want to use `bootsy_area`
-with it, then you should include the `Bootsy::Container` module:
+your models. For instance, if you have a `Post` model and you want to use `bootsy_area`
+with it, you must include the `Bootsy::Container` module:
 ```ruby
 class Post < ActiveRecord::Base
   include Bootsy::Container
 end
 ```
 
-Don't forget to ensure the association of new instances of your model with Bootsy
-image galleries. For `strong_parameters`, you must allow the parameter `bootsy_image_gallery_id`
-in your controllers. Example:
+Don't forget to ensure the association between your model objects with Bootsy
+image galleries. For `strong_parameters`, you must whitelist the `bootsy_image_gallery_id` parameter
+in your controller:
 ```ruby
 private
-# Never trust parameters from the scary internet, only allow the white list through.
+
 def post_params
   params.require(:post).permit(:title, :content, :bootsy_image_gallery_id)
 end
@@ -87,8 +87,7 @@ end
 
 ## Bootsy with [Simple Form](https://github.com/plataformatec/simple_form) builders
 
-Just use the brand new input type `bootsy` in your `SimpleForm::FormBuilder` instances,
-in the same way you would use the basic `text` input. Example:
+You can use `bootsy` as an input type in `SimpleForm::FormBuilder` instances. Example:
 ```erb
 <%= simple_form_for @post do |f| %>
   <%= f.input :title %>
@@ -102,52 +101,47 @@ in the same way you would use the basic `text` input. Example:
 
 ## Editor options
 
-It is possible to customize how the editor is displayed and its behavior by passing
-a hash `editor_options` to your `bootsy_area`.
+You can customize Bootsy through a hash of `editor_options`:
 
 
-### Buttons
+### Enable/disable features
 
-You can enable/disable the buttons available on the editor. For example, if you
-want to disable the link and color buttons:
+You can enable and disable features as you like. For instance, if you don't want link and color features:
 ```erb
-<%= f.bootsy_area :my_attribute, editor_options: {link: false, color: false} %>
+<%= f.bootsy_area :my_attribute, editor_options: { link: false, color: false } %>
 ```
 Available options are: `:font_styles`, `:emphasis`, `:lists`, `:html`, `:link`, `:image` and `:color`.
 
 
-### Alert for usaved changes
+### Alert of usaved changes
 
-By default, Bootsy alerts for unsaved changes if the user attempts to unload
-the window. You can disable this behaviour by doing:
+By default Bootsy alerts the user about unsaved changes if the page is closed or reloaded. You can disable 
+this feature with:
 ```erb
-<%= f.bootsy_area :my_attribute, editor_options: {alert_unsaved: false} %>
+<%= f.bootsy_area :my_attribute, editor_options: { alert_unsaved: false } %>
 ```
 
-## Uploader
+## Uploads
 
-It's also possible to use Bootsy without the image upload feature. Just call
-`bootsy_area` in a form builder not associated to a `Bootsy::Container` model.
-This way users can insert images in their texts by providing an image url.
+If you don't want to have image uploads, just call `bootsy_area` in a form builder not 
+associated to a `Bootsy::Container` model. This way users will still be able to insert 
+images in the text area using an external image URL.
 
 
 ## Configuration
 
 You can set the default editor options, image sizes available (small, medium,
-large and/or its original), its dimensions and more. Take a look at the initalizer
-file, `/config/initializers/bootsy.rb`.
+large and/or its original), dimensions and more. Take a look at Bootsy's initalizer
+file `/config/initializers/bootsy.rb` in your app and feel free to uncomment and change
+the options as you like.
 
 
 ## I18n
 
-Bootsy defines some i18n keys. The english translation is automatically added
-to your `config/locales` directory as `bootsy.en.yml`. You can follow that template
-in order to translate Bootsy to your language. You can find some examples
-[here](https://github.com/volmer/bootsy/tree/master/config/locales). It is also
-necessary to add a translation for Bootstrap-wysihtml5, the javascript editor, in
-your assets pipeline. Instructions [here](https://github.com/jhollingworth/bootstrap-wysihtml5#i18n).
-If you are using the alert for unsaved changes, you have to define a translation
-for it as well. Just follow [this example](https://github.com/volmer/bootsy/tree/master/app/assets/bootsy/locales/bootsy.pt-BR.js).
+Bootsy defines some i18n keys. English translations are added by default to your 
+`config/locales` directory as `bootsy.en.yml`. You can use it as a template
+to translate Bootsy to your language. [Here are some examples](https://github.com/volmer/bootsy/tree/master/config/locales). You also need to translate Bootstrap-wysihtml5, the underlying javascript editor. Instructions [here](https://github.com/jhollingworth/bootstrap-wysihtml5#i18n). Unless you have disabled it, it's 
+also nice to translate the alert message of unsaved changes. Just follow [this example](https://github.com/volmer/bootsy/tree/master/app/assets/bootsy/locales/bootsy.pt-BR.js).
 
 
 ## License

data/Rakefile

@@ -25,14 +25,14 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
+require 'rubocop/rake_task'
 
+RuboCop::RakeTask.new
 Coveralls::RakeTask.new
-
-task default: [:spec, :cucumber, 'coveralls:push']
-
 RSpec::Core::RakeTask.new(:spec)
-
-Cucumber::Rake::Task.new do |t|
+Cucumber::Rake::Task.new do |_|
   # Uncomment this line when cucumber/multi_test work with minitest.
   # t.cucumber_opts = %w{--format pretty -s}
 end
+
+task default: [:rubocop, :spec, :cucumber, 'coveralls:push']

data/app/assets/javascripts/bootsy/editor_options.js

@@ -72,7 +72,19 @@ window.Bootsy.options = {
       "div": 1,
       // to allow save and edit files with code tag hacks
       "code": 1,
-      "pre": 1
+      "pre": 1,
+      // this allows youtube embed codes
+      "iframe": {
+        set_attributes: {
+          "frameborder": "0",
+          "allowfullscreen": "1"
+        },
+        check_attributes: {
+          "width": "numbers",
+          "height": "numbers",
+          "src": "href"
+        }
+      }
     }
   },
   color: true,

data/app/assets/stylesheets/bootsy.css

@@ -1,3 +1,333 @@
- /*
- *= require_tree .
- */
+/*
+  Bootstrap-submenu
+*/
+
+.dropdown-submenu {
+  position:relative;
+}
+
+.dropdown-submenu>.dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+  -moz-border-radius: 0 6px 6px 6px;
+  border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display:block;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  content: " ";
+  float: right;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #cccccc;
+  margin-top: 5px;
+  margin-right: -10px;
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float:none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+  -moz-border-radius: 6px 0 6px 6px;
+  border-radius: 6px 0 6px 6px;
+}
+
+/*
+  Bootstrap-wysihtml5
+*/
+
+ul.wysihtml5-toolbar {
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+
+ul.wysihtml5-toolbar::after {
+  clear: both;
+  display: table;
+  content: "";
+}
+
+ul.wysihtml5-toolbar > li {
+  float: left;
+  display: list-item;
+  list-style: none;
+  margin: 0 5px 10px 0;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=bold] {
+  font-weight: bold;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=italic] {
+  font-style: italic;
+}
+
+ul.wysihtml5-toolbar a[data-wysihtml5-command=underline] {
+  text-decoration: underline;
+}
+
+ul.wysihtml5-toolbar a.btn.wysihtml5-command-active {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #E6E6E6;
+  background-color: #D9D9D9;
+  outline: 0;
+}
+
+ul.wysihtml5-commands-disabled .dropdown-menu {
+  display: none !important;
+}
+
+ul.wysihtml5-toolbar div.wysihtml5-colors {
+  display:block;
+  width: 50px;
+  height: 20px;
+  margin-top: 2px;
+  margin-left: 5px;
+  position: absolute;
+  pointer-events: none;
+}
+
+ul.wysihtml5-toolbar a.wysihtml5-colors-title {
+  padding-left: 70px;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="black"] {
+  background: black !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="silver"] {
+  background: silver !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="gray"] {
+  background: gray !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="maroon"] {
+  background: maroon !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="red"] {
+  background: red !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="purple"] {
+  background: purple !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="green"] {
+  background: green !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="olive"] {
+  background: olive !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="navy"] {
+  background: navy !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="blue"] {
+  background: blue !important;
+}
+
+ul.wysihtml5-toolbar div[data-wysihtml5-command-value="orange"] {
+  background: orange !important;
+}
+
+/*
+  Bootsy
+*/
+
+.wysiwyg-color-black {
+  color: black;
+}
+
+.wysiwyg-color-silver {
+  color: silver;
+}
+
+.wysiwyg-color-gray {
+  color: gray;
+}
+
+.wysiwyg-color-white {
+  color: white;
+}
+
+.wysiwyg-color-maroon {
+  color: maroon;
+}
+
+.wysiwyg-color-red {
+  color: red;
+}
+
+.wysiwyg-color-purple {
+  color: purple;
+}
+
+.wysiwyg-color-fuchsia {
+  color: fuchsia;
+}
+
+.wysiwyg-color-green {
+  color: green;
+}
+
+.wysiwyg-color-lime {
+  color: lime;
+}
+
+.wysiwyg-color-olive {
+  color: olive;
+}
+
+.wysiwyg-color-orange {
+  color: orange;
+}
+
+.wysiwyg-color-yellow {
+  color: yellow;
+}
+
+.wysiwyg-color-navy {
+  color: navy;
+}
+
+.wysiwyg-color-blue {
+  color: blue;
+}
+
+.wysiwyg-color-teal {
+  color: teal;
+}
+
+.wysiwyg-color-aqua {
+  color: aqua;
+}
+
+.wysiwyg-float-left {
+  float: left;
+  margin: 0 8px 8px 0;
+}
+
+.wysiwyg-float-right {
+  float: right;
+  margin: 0 0 8px 8px;
+}
+
+.bootsy blockquote {
+  padding: 10px 20px;
+  margin: 0 0 20px;
+  font-size: 17.5px;
+  border-left: 5px solid #eee;
+}
+.bootsy blockquote p:last-child,
+.bootsy blockquote ul:last-child,
+.bootsy blockquote ol:last-child {
+  margin-bottom: 0;
+}
+.bootsy blockquote footer,
+.bootsy blockquote small,
+.bootsy blockquote .small {
+  display: block;
+  font-size: 80%;
+  line-height: 1.42857143;
+  color: #777;
+}
+.bootsy blockquote footer:before,
+.bootsy blockquote small:before,
+.bootsy blockquote .small:before {
+  content: '\2014 \00A0';
+}
+.bootsy .blockquote-reverse,
+.bootsy blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  text-align: right;
+  border-right: 5px solid #eee;
+  border-left: 0;
+}
+.bootsy .blockquote-reverse footer:before,
+.bootsy blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
+.bootsy blockquote.pull-right small:before,
+.bootsy .blockquote-reverse .small:before,
+.bootsy blockquote.pull-right .small:before {
+  content: '';
+}
+.bootsy .blockquote-reverse footer:after,
+.bootsy blockquote.pull-right footer:after,
+.bootsy .blockquote-reverse small:after,
+.bootsy blockquote.pull-right small:after,
+.bootsy .blockquote-reverse .small:after,
+.bootsy blockquote.pull-right .small:after {
+  content: '\00A0 \2014';
+}
+.bootsy blockquote:before,
+.bootsy blockquote:after {
+  content: "";
+}
+
+textarea.bootsy:required:invalid {
+  color: inherit;
+}
+
+/*Modal Design Styles*/
+
+.bootsy-modal .file-input-name {display: none;}  /*Hide the input file name from showing as it's not needed and ruins design*/
+
+/*Set a min-height on the modal body to prevent jumping up and down of modal when adding content*/
+.bootsy-modal .modal-body {
+  min-height: 120px;
+}
+
+.bootsy-image {
+  margin-bottom: 15px;
+}
+
+.bootsy-upload-loader {
+  display: inline-block;
+  padding-right: 5px;
+}
+
+.bootsy-gallery-loader {
+  display: block;
+  margin: 0 auto;
+}
+
+/*The below code is needed for capybara to be able to find the input, as it*/
+/*does not work*/
+.file-input-wrapper input[type=file], .file-input-wrapper input[type=file]:focus, .file-input-wrapper input[type=file]:hover {
+  opacity: .01;
+}
+
+/* Avoid Boostrap input borders */
+body.bootsy_text_area.form-control {
+  border: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}