bootsy 0.0.5 → 0.1.0

data/README.md

@@ -15,7 +15,7 @@ Bootsy
 
 ## Installation
 
-1. Add Bootsy to your GemFile:
+1. Add Bootsy to your Gemfile:
 
   ```ruby
   gem 'bootsy'
@@ -41,7 +41,7 @@ Bootsy
 
 ## Usage
 
-Just call the brand new method `bootsy_area` in your `FormBuilder` instances, in the same way that you call the basic `textarea` method. Example:
+Just call the brand new method `bootsy_area` in your `FormBuilder` instances, in the same way you call the basic `textarea` method. Example:
 
   ```erb
   <%= form_for(@post) do |f| %>
@@ -55,11 +55,11 @@ Just call the brand new method `bootsy_area` in your `FormBuilder` instances, in
   <% end %>
   ```
 
-Bootsy will group the uploaded image files 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 `MediaContainer` module:
+Bootsy will group the uploaded image files 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:
 
   ```ruby
   class Post < ActiveRecord::Base
-    include Bootsy::MediaContainer
+    include Bootsy::Container
     
     attr_accessible :content, :title
   end
@@ -76,6 +76,11 @@ Bootsy defines some i18n keys. The english translation is automatically added to
 Par default, Bootsy only supports ActiveRecord. In order to use Bootsy with Mongoid, please use [bootsy-mongoid](https://github.com/volmer/bootsy-mongoid) instead.
 
 
+## Bootsy with SimpleForm
+
+Do you want to use Bootsy alongside with [SimpleForm](https://github.com/plataformatec/simple_form)? Take a look at [Bootsy-SimpleForm](https://github.com/volmer/bootsy-simple_form).
+
+
 ## License
 
 MIT License. Copyright 2012 Volmer Soares

data/app/assets/javascripts/bootsy/bootstrap-wysihtml5.js

@@ -12,6 +12,7 @@
                                    "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div'>" + locale.font_styles.normal + "</a></li>" +
                                    "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1'>" + locale.font_styles.h1 + "</a></li>" +
                                    "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2'>" + locale.font_styles.h2 + "</a></li>" +
+                                   "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3'>" + locale.font_styles.h3 + "</a></li>" +
                                "</ul>" +
                            "</li>",
             "emphasis":    "<li>" +
@@ -69,6 +70,25 @@
                                "<div class='btn-group'>" +
                                    "<a class='btn' data-wysihtml5-action='change_view' title='" + locale.html.edit + "'><i class='icon-pencil'></i></a>" +
                                "</div>" +
+                           "</li>",
+
+            "color":       "<li class='dropdown'>" +
+                               "<a class='btn dropdown-toggle' data-toggle='dropdown' href='#'>" +
+                                   "<span class='current-color'>" + locale.colours.black + "</span>&nbsp;<b class='caret'></b>" +
+                               "</a>" +
+                               "<ul class='dropdown-menu'>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='black'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='black'>" + locale.colours.black + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='silver'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='silver'>" + locale.colours.silver + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='gray'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='gray'>" + locale.colours.gray + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='maroon'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='maroon'>" + locale.colours.maroon + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='red'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='red'>" + locale.colours.red + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='purple'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='purple'>" + locale.colours.purple + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='green'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='green'>" + locale.colours.green + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='olive'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='olive'>" + locale.colours.olive + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='navy'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='navy'>" + locale.colours.navy + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='blue'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='blue'>" + locale.colours.blue + "</a></li>" +
+                                   "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='orange'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='orange'>" + locale.colours.orange + "</a></li>" +
+                               "</ul>" +
                            "</li>"
         };
         return tpl[key];
@@ -76,6 +96,7 @@
 
     var defaultOptions = {
         "font-styles": true,
+        "color": false,
         "emphasis": true,
         "lists": true,
         "html": false,
@@ -85,6 +106,27 @@
         imageUploadCallback: undefined,
         events: {},
         parserRules: {
+            classes: {
+              // (path_to_project/lib/css/wysiwyg-color.css)
+              "wysiwyg-color-silver" : 1,
+              "wysiwyg-color-gray" : 1,
+              "wysiwyg-color-white" : 1,
+              "wysiwyg-color-maroon" : 1,
+              "wysiwyg-color-red" : 1,
+              "wysiwyg-color-purple" : 1,
+              "wysiwyg-color-fuchsia" : 1,
+              "wysiwyg-color-green" : 1,
+              "wysiwyg-color-lime" : 1,
+              "wysiwyg-color-olive" : 1,
+              "wysiwyg-color-yellow" : 1,
+              "wysiwyg-color-navy" : 1,
+              "wysiwyg-color-blue" : 1,
+              "wysiwyg-color-teal" : 1,
+              "wysiwyg-color-aqua" : 1,
+              "wysiwyg-color-orange" : 1,
+              "wysiwyg-float-left": 1,
+              "wysiwyg-float-right": 1
+            },
             tags: {
                 "b":  {},
                 "i":  {},
@@ -94,6 +136,7 @@
                 "li": {},
                 "h1": {},
                 "h2": {},
+                "h3": {},
                 "blockquote": {},
                 "u": 1,
                 "img": {
@@ -102,6 +145,9 @@
                         "alt": "alt",
                         "src": "src",
                         "height": "numbers"
+                    },
+                    "add_class": {
+                        "align": "align_img"
                     }
                 },
                 "a":  {
@@ -112,10 +158,12 @@
                     check_attributes: {
                         href:   "url" // important to avoid XSS
                     }
-                }
+                },
+                "span": 1,
+                "div": 1
             }
         },
-        stylesheets: [],
+        stylesheets: ["/assets/bootsy/bootsy.css"], // (path_to_project/lib/css/wysiwyg-color.css)
         locale: "en"
     };
 
@@ -140,7 +188,7 @@
         constructor: Wysihtml5,
 
         createEditor: function(options) {
-            options = $.extend(defaultOptions, options || {});
+          options = $.extend({}, defaultOptions, options || {});
 		    options.toolbar = this.toolbar[0];
 
 		    var editor = new wysi.Editor(this.el[0], options);
@@ -160,7 +208,7 @@
                 'class' : "wysihtml5-toolbar",
                 'style': "display:none"
             });
-
+	          var culture = options.locale || defaultOptions.locale || "en";
             for(var key in defaultOptions) {
                 var value = false;
 
@@ -173,17 +221,17 @@
                 }
 
                 if(value === true) {
-                    toolbar.append(templates(key, locale[options.locale || "en"]));
+                    toolbar.append(templates(key, locale[culture]));
 
-                    if(key == "html") {
+                    if(key === "html") {
                         this.initHtml(toolbar);
                     }
 
-                    if(key == "link") {
+                    if(key === "link") {
                         this.initInsertLink(toolbar);
                     }
 
-                    if(key == "image") {
+                    if(key === "image") {
                         this.initInsertImage(toolbar);
                     }
 
@@ -193,11 +241,24 @@
                 }
             }
 
+            if(options.toolbar) {
+                for(key in options.toolbar) {
+                   toolbar.append(options.toolbar[key]);
+                }
+            }
+
             toolbar.find("a[data-wysihtml5-command='formatBlock']").click(function(e) {
-                var el = $(e.srcElement);
+                var target = e.target || e.srcElement;
+                var el = $(target);
                 self.toolbar.find('.current-font').text(el.html());
             });
 
+            toolbar.find("a[data-wysihtml5-command='foreColor']").click(function(e) {
+                var target = e.target || e.srcElement;
+                var el = $(target);
+                self.toolbar.find('.current-color').text(el.html());
+            });
+
             this.el.before(toolbar);
 
             return toolbar;
@@ -241,11 +302,18 @@
             });
 
             toolbar.find('a[data-wysihtml5-command=insertImage]').click(function() {
+              var activeButton = $(this).hasClass("wysihtml5-command-active");
+
+              if (!activeButton) {
                 insertImageModal.modal('show');
                 insertImageModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-				    e.stopPropagation();
-        });
+					       e.stopPropagation();
+				        });
                 return false;
+              }
+              else {
+                return true;
+              }
             });
         },
 
@@ -292,14 +360,19 @@
             });
 
             toolbar.find('a[data-wysihtml5-command=createLink]').click(function() {
-                insertLinkModal.modal('show');
+              var activeButton = $(this).hasClass("wysihtml5-command-active");
+              
+              if (!activeButton) {
+                insertLinkModal.append('body').modal('show');
                 insertLinkModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-					e.stopPropagation();
-				});
+        					e.stopPropagation();
+        				});
                 return false;
+              }
+              else {
+                return true;
+              }
             });
-
-
         }
     };
 
@@ -317,7 +390,8 @@
             font_styles: {
                 normal: "Normal text",
                 h1: "Heading 1",
-                h2: "Heading 2"
+                h2: "Heading 2",
+                h3: "Heading 3"
             },
             emphasis: {
                 bold: "Bold",
@@ -340,6 +414,19 @@
             },
             html: {
                 edit: "Edit HTML"
+            },
+            colours: {
+                black: "Black",
+                silver: "Silver",
+                gray: "Grey",
+                maroon: "Maroon",
+                red: "Red",
+                purple: "Purple",
+                green: "Green",
+                olive: "Olive",
+                navy: "Navy",
+                blue: "Blue",
+                orange: "Orange"
             }
         }
     };

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

@@ -1,63 +1,125 @@
-function bootsyProgressBar(element){
-  element.find('div.modal-body').html('<div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div>');
-}
+var Bootsy = (function(){
 
-function bootsyRefreshGallery(element){
-  element.find('a.refresh_btn').show().click();
-}
+  var Bootsy = {unsavedChanges: false};
 
-function bootsyOpenImageGallery(editor){
-  $('#bootsy_image_gallery').modal('show');
-}
+  
+  Bootsy.progressBar = function(element){
+    element.find('div.modal-body').html('<div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div>');
+  };
 
-function bootsyInsertImage(image, editor){
-  $('#bootsy_image_gallery').modal('hide');
-  editor.composer.commands.exec("insertImage", image);
-}
+  Bootsy.refreshGallery = function(element){
+    element.find('a.refresh_btn').show().click();
+  };
 
-$(document).ready(function(){
-  element = $('#bootsy_image_gallery');
-  
-  element.parents('form').after(element);
+  Bootsy.openImageGallery = function(editor){
+    $('#bootsy_image_gallery').modal('show');
+  };
+
+  Bootsy.insertImage = function(image, editor){
+    $('#bootsy_image_gallery').modal('hide');
+    editor.composer.commands.exec("insertImage", image);
+  }
+
+  Bootsy.alertUnsavedChanges = function(){
+    if(unsavedChanges){  
+      return "<%= I18n.t 'bootsy.js.alert_unsaved' %>"; 
+    }
+  };
+
+  Bootsy.ready = function(){
+    if($('textarea.bootsy_text_area').length > 0){
+      element = $('#bootsy_image_gallery');
+      
+      element.parents('form').after(element);
+
+      element.find('a.refresh_btn').live('click', function(e){
+        $(this).hide();
+        Bootsy.progressBar(element);
+      });
+
+      element.find('a.destroy_btn').click(function(e){
+        Bootsy.progressBar(element);
+      });
+
+      // element.find('#new_image').live('ajax:before', function(e){
+      //   console.log('sending...')
+      //   Bootsy.progressBar(element);
+      // });
 
-  element.find('a.refresh_btn').live('click', function(e){
-    $(this).hide();
-    bootsyProgressBar(element);
-  });
+      element.modal({show: false});
+      element.on('shown', function(){
+        Bootsy.refreshGallery(element);
+      });
 
-  element.find('a.destroy_btn').click(function(e){
-    bootsyProgressBar(element);
-  });
+      var editorOptions = {color: true, locale: "<%= I18n.default_locale %>"};
 
-  element.modal({show: false});
-  element.on('shown', function(){
-    bootsyRefreshGallery(element);
-  });
+      if($('textarea.bootsy_text_area').attr('data-enable-image') == 'false'){
+        editorOptions.image = false;
+      }else{
+        if($('textarea.bootsy_text_area').attr('data-enable-uploader') == 'false'){
+          editorOptions.image = true;
+        }else{
+          editorOptions.image = false;
+          editorOptions.imageUpload = true;
+          editorOptions.imageUploadCallback = Bootsy.openImageGallery;
+        }
+      }
 
-  wysihtml5Editor = $('textarea.bootsy_text_area').wysihtml5({"image": false, "imageUpload": true, imageUploadCallback: bootsyOpenImageGallery, locale: "<%= I18n.default_locale %>"}).data("wysihtml5").editor;
+      if($('textarea.bootsy_text_area').attr('data-enable-font-styles') == 'false') editorOptions['font-styles'] = false;
+      if($('textarea.bootsy_text_area').attr('data-enable-emphasis') == 'false') editorOptions.emphasis = false;
+      if($('textarea.bootsy_text_area').attr('data-enable-lists') == 'false') editorOptions.lists = false;
+      if($('textarea.bootsy_text_area').attr('data-enable-html') == 'true') editorOptions.html = true;
+      if($('textarea.bootsy_text_area').attr('data-enable-link') == 'false') editorOptions.link = false;
+      if($('textarea.bootsy_text_area').attr('data-enable-color') == 'false') editorOptions.color = false;
 
-  element.on('hide', function() {
-    wysihtml5Editor.currentView.element.focus();
-  });
+      Bootsy.editor = $('textarea.bootsy_text_area').wysihtml5(editorOptions).data("wysihtml5").editor;
 
-  element.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-    e.stopPropagation();
-  });
+      element.on('hide', function() {
+        Bootsy.editor.currentView.element.focus();
+      });
 
-  element.find('ul.dropdown-menu a.insert').live('click', function(e){
-    var imagePrefix = "/"+$(this).attr('data-image-size')+"_";
-    if($(this).attr('data-image-size') == 'original'){
-      imagePrefix = '/';
+      element.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
+        e.stopPropagation();
+      });
+
+      element.find('ul.dropdown-menu a.insert').live('click', function(e){
+        var imagePrefix = "/"+$(this).attr('data-image-size')+"_";
+        if($(this).attr('data-image-size') == 'original'){
+          imagePrefix = '/';
+        }
+        var img = $(this).parents('li.dropdown').find('img');
+        var obj = {
+          src: img.attr('src').replace("/thumb_", imagePrefix),
+          alt: img.attr('alt').replace("Thumb_", "")
+        };
+
+        obj.align = $(this).attr('data-position');
+
+        Bootsy.insertImage(obj, Bootsy.editor);
+      });
+
+      Bootsy.editor.on("change", function(){
+        Bootsy.unsavedChanges = true;
+      });
+
+      $('textarea.bootsy_text_area').closest('form').submit(function(e){
+        Bootsy.unsavedChanges = false;
+        return true;
+      });
+
+      // In order to properly work with Twitter Bootstrap 2.1
+      $('body').off('click.dropdown touchstart.dropdown.data-api', '.dropdown');
+      $('body').on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function(e){ 
+        e.stopPropagation();
+      });
+
+      if($('textarea.bootsy_text_area').attr('data-alert-unsaved') != 'false'){
+        window.onbeforeunload = Bootsy.alertUnsavedChanges;
+      }
     }
-    var img = $(this).parents('li.dropdown').find('img');
-    var src = img.attr('src').replace("/thumb_", imagePrefix);
-    var alt = img.attr('alt');
-
-    bootsyInsertImage({src: src, alt: alt}, wysihtml5Editor);
-  });
-
-  $('body').off('click.dropdown touchstart.dropdown.data-api', '.dropdown');
-  $('body').on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function(e){ 
-    e.stopPropagation();
-  });
-});
+  };
+
+  return Bootsy;
+}).call(this);
+
+$(Bootsy.ready);

data/app/assets/javascripts/bootsy/locales/bootstrap-wysihtml5.pt-BR.js

@@ -4,31 +4,45 @@
 (function($){
     $.fn.wysihtml5.locale["pt-BR"] = {
         font_styles: {
-              normal: "Texto normal",
-              h1: "Título 1",
-              h2: "Título 2"
+            normal: "Texto normal",
+            h1: "Título 1",
+            h2: "Título 2",
+            h3: "Título 3"
         },
         emphasis: {
-              bold: "Negrito",
-              italic: "Itálico",
-              underline: "Sublinhado"
+            bold: "Negrito",
+            italic: "Itálico",
+            underline: "Sublinhado"
         },
         lists: {
-              unordered: "Lista",
-              ordered: "Lista numerada",
-              outdent: "Remover indentação",
-              indent: "Indentar"
+            unordered: "Lista",
+            ordered: "Lista numerada",
+            outdent: "Remover indentação",
+            indent: "Indentar"
         },
         link: {
-              insert: "Inserir link",
-              cancel: "Cancelar"
+            insert: "Inserir link",
+            cancel: "Cancelar"
         },
         image: {
-              insert: "Inserir imagem",
-              cancel: "Cancelar"
+            insert: "Inserir imagem",
+            cancel: "Cancelar"
         },
         html: {
             edit: "Editar HTML"
+        },
+        colours: {
+            black: "Preto",
+            silver: "Prata",
+            gray: "Cinza",
+            maroon: "Marrom",
+            red: "Vermelho",
+            purple: "Roxo",
+            green: "Verde",
+            olive: "Oliva",
+            navy: "Marinho",
+            blue: "Azul",
+            orange: "Laranja"
         }
     };
 }(jQuery));

data/app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css

@@ -35,10 +35,68 @@ ul.wysihtml5-toolbar a.btn.wysihtml5-command-active {
 	-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 9;
+	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;
+}

data/app/assets/stylesheets/bootsy/bootsy.css

@@ -0,0 +1,77 @@
+.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-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;
+}
+
+form.bootsy .field_with_errors { 
+  display: inline-block; 
+}

data/app/controllers/bootsy/images_controller.rb

@@ -20,7 +20,8 @@ module Bootsy
     def create
       @gallery = find_gallery
       @gallery.save! unless @gallery.persisted?
-      @image = @gallery.images.new params[:image]
+      @image = Image.new params[:image]
+      @image.image_gallery_id = @gallery.id
       @images = @gallery.images
   
       respond_to do |format|
@@ -28,7 +29,6 @@ module Bootsy
           format.js
           format.json { render json: @image, status: :created, location: @image }
         else
-          pp @image.errors
           format.js
           format.json { render json: @image.errors, status: :unprocessable_entity }
         end

data/app/uploaders/bootsy/image_uploader.rb

@@ -11,22 +11,22 @@ module Bootsy
 
 
     def store_dir
-      "uploads/#{model.class.to_s.underscore}/#{model.id}"
+      "#{Bootsy.store_dir}/#{model.class.to_s.underscore}/#{model.id}"
     end
 
     # Process files as they are uploaded:
-    process :resize_to_limit => [940, 940]
+    process :resize_to_limit => [1160, 2000]
 
     version :large do
-      process :resize_to_fit => [600, 600]
+      process :resize_to_fit => [Bootsy.large_image[:width], Bootsy.large_image[:height]]
     end
 
     version :medium do
-      process :resize_to_fit => [300, 300]
+      process :resize_to_fit => [Bootsy.medium_image[:width], Bootsy.medium_image[:height]]
     end
 
     version :small do
-      process :resize_to_fit => [160, 160]
+      process :resize_to_fit => [Bootsy.small_image[:width], Bootsy.small_image[:height]]
     end
 
     version :thumb do

data/app/views/bootsy/images/_index.html.erb

@@ -4,21 +4,32 @@
       <%= link_to image_tag(image.image_file.thumb.url), '#', :class => 'thumbnail', data: { toggle: 'dropdown'} %>
       <ul class="dropdown-menu" role="menu">
         <li class="nav-header"><%= t 'bootsy.image.size' %></li>
-        <% [:small, :medium, :large, :original].each do |size| %>
-          <li>
-            <%= link_to '#', :class => 'insert', tabindex: '-1', data: { :'image-size' => size.to_s} do %>
+        <% Bootsy.image_versions_available.each do |size| %>
+          <li class="dropdown-submenu">
+            <%= link_to '#' do %>
               <i class="icon-picture"></i>
               <%= t "bootsy.image.#{size}" %>
             <% end %>
+            <ul class="dropdown-menu">
+              <% [:left, :right, :inline].each do |position| %>
+                <li>
+                  <%= link_to '#', :class => 'insert', tabindex: '-1', data: { :'image-size' => size.to_s, position: position.to_s} do %>
+                    <%= t "bootsy.image.position.#{position}" %>
+                  <% end %>
+                </li>
+              <% end %>
+            </ul>
+          </li>
+        <% end %>
+        <% if Bootsy.allow_destroy %>
+          <li class="divider"></li>
+          <li>
+            <%= link_to image, method: :delete, remote: true, data: { confirm: t('bootsy.image.confirm.destroy')}, tabindex: '-1', :class => 'destroy_btn' do %>
+              <i class="icon-trash"></i>
+              <%= t 'bootsy.action.destroy' %>
+            <% end %>
           </li>
         <% end %>
-        <li class="divider"></li>
-        <li>
-          <%= link_to image, method: :delete, remote: true, data: { confirm: t('bootsy.image.confirm.destroy')}, tabindex: '-1', :class => 'destroy_btn' do %>
-            <i class="icon-trash"></i>
-            <%= t 'bootsy.action.destroy' %>
-          <% end %>
-        </li>
       </ul>
     </li>
   <% end %>

data/app/views/bootsy/images/_modal.html.erb

@@ -4,7 +4,7 @@
     <h2><%= t 'bootsy.image.p' %></h2>
   </div>
   <div class="modal-body">
-    <%= refresh_btn resource.bootsy_image_gallery, :images %>
+    <%= refresh_btn container.bootsy_image_gallery, :images %>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal"><%= t 'bootsy.action.close' %></a>

data/app/views/bootsy/images/destroy.js.erb

@@ -1 +1 @@
-bootsyRefreshGallery($('#bootsy_image_gallery'));
+Bootsy.refreshGallery($('#bootsy_image_gallery'));

data/config/locales/en.yml

@@ -17,3 +17,9 @@ en:
       new: New image
       confirm:
         destroy: Are you sure you want do destroy this image?
+      position:
+        left: Left
+        right: Right
+        inline: Inline
+    js:
+      alert_unsaved: You have unsaved changes.

data/config/locales/pt-BR.yml

@@ -16,4 +16,10 @@ pt-BR:
       original: Original
       new: Nova imagem
       confirm:
-        destroy: Tem certeza que deseja apagar esta imagem?
+        destroy: Tem certeza que deseja apagar esta imagem?
+      position:
+        left: Esquerda
+        right: Direita
+        inline: Mesma linha
+    js:
+      alert_unsaved: As suas modificações ainda não foram gravadas.

data/config/routes.rb

@@ -3,5 +3,9 @@ Bootsy::Engine.routes.draw do
     resources :images, only: [:index, :create, :update, :destroy]
   end
 
-  resources :images, only: [:index, :create, :update, :destroy]
+  file_routes = [:index, :create, :update]
+
+  file_routes << :destroy if Bootsy.allow_destroy
+
+  resources :images, only: file_routes
 end

data/lib/bootsy.rb

@@ -1,10 +1,48 @@
 require 'carrierwave'
 require 'remotipart'
 require 'bootsy/engine'
-require 'bootsy/media_container'
+require 'bootsy/container'
 require 'bootsy/form_helper'
 require 'bootsy/form_builder'
 require 'bootsy/core_ext'
 
 module Bootsy
+  ## CONFIGURATION OPTIONS
+
+  # Image versions available
+  mattr_accessor :image_versions_available
+  @@image_versions_available = [:small, :medium, :large, :original]
+
+  # Whether user can destroy uploaded files
+  mattr_accessor :allow_destroy
+  @@allow_destroy = true
+
+  # Settings for small images
+  mattr_accessor :small_image
+  @@small_image = {width: 160, height: 160}
+
+  # Settings for medium images
+  mattr_accessor :medium_image
+  @@medium_image = {width: 360, height: 360}
+
+  # Settings for large images
+  mattr_accessor :large_image
+  @@large_image = {width: 760, height: 760}
+
+  # Settings for the original version of images
+  mattr_accessor :original_image
+  @@original_image = {}
+
+  # Store directory (inside of 'public')
+  mattr_accessor :store_dir
+  @@store_dir = 'uploads'
+
+
+  ## SETUP
+
+  # Default way to setup Bootsy. Run rails generate bootsy:install
+  # to create a fresh initializer with all configuration values.
+  def self.setup
+    yield self
+  end
 end

data/lib/bootsy/activerecord/image.rb

@@ -1,6 +1,6 @@
 module Bootsy
   class Image < ActiveRecord::Base
-    belongs_to :image_gallery
+    belongs_to :image_gallery, touch: true
 
     mount_uploader :image_file, ImageUploader
 

data/lib/bootsy/{media_container.rb → container.rb}

@@ -1,7 +1,7 @@
 require 'active_support/concern'
 
 module Bootsy
-  module MediaContainer 
+  module Container 
 
     extend ActiveSupport::Concern
     

data/lib/bootsy/form_helper.rb

@@ -2,20 +2,46 @@ module Bootsy
   module FormHelper
     def bootsy_area object, method, options = {}
 
-      resource = options[:resource]
-      options.delete :resource
+      container = options.delete :container
 
-      unless resource.kind_of?(MediaContainer) || (resource.nil? && object.kind_of?(MediaContainer))
-        raise ArgumentError, 'Bootsy area needs a model or a resource as its option'
+      unless container.kind_of?(Container) || (container.nil? && object.kind_of?(Container))
+        raise ArgumentError, 'Bootsy area needs a model or a container as its option'
+      end
+
+      editor_options = options.delete :editor_options
+
+      unless editor_options.nil?
+        
+        options[:'data-enable-uploader'] = 'false' if editor_options[:uploader] == false
+
+        options[:'data-alert-unsaved'] = 'false' if editor_options[:alert_unsaved] == false
+      
+        options[:'data-enable-font-styles'] = 'false' if editor_options[:font_styles] == false
+      
+        options[:'data-enable-emphasis'] = 'false' if editor_options[:emphasis] == false
+      
+        options[:'data-enable-lists'] = 'false' if editor_options[:lists] == false
+      
+        options[:'data-enable-html'] = 'true' if editor_options[:html] == true
+      
+        options[:'data-enable-link'] = 'false' if editor_options[:link] == false
+      
+        options[:'data-enable-image'] = 'false' if editor_options[:image] == false
+      
+        options[:'data-enable-color'] = 'false' if editor_options[:color] == false
+        
       end
 
       object_name = object.class.name.underscore
       
-      output = self.render 'bootsy/images/modal', {resource: resource || object}
-      output += self.text_area object_name, method, options.merge({:class => 'bootsy_text_area'}){|key, oldval, newval| "#{oldval} #{newval}"}
-      if resource.nil? || (resource == object)
+      output = self.render 'bootsy/images/modal', {container: container || object}
+      options[:class] = (options[:class].nil? ? [] : (options[:class].kind_of?(Array) ? options[:class] : [options[:class]])) + [:bootsy_text_area]
+      output += self.text_area object_name, method, options
+
+      if container.nil? || (container == object)
         output += self.hidden_field object_name, :bootsy_image_gallery_id, :class => 'bootsy_image_gallery_id'
       end
+      
       output
     end
   end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/generators/bootsy/install_generator.rb

@@ -31,6 +31,10 @@ module Bootsy
 
       end
 
+      def copy_config
+        template '../templates/bootsy.rb', 'config/initializers/bootsy.rb'
+      end
+
     end
   end
 end

data/lib/generators/bootsy/templates/bootsy.rb

@@ -0,0 +1,43 @@
+# Use this setup block to configure all options available in Bootsy.
+Bootsy.setup do |config|
+
+  # Image versions available
+  # Possible values: :small, :medium, :large and/or :original
+  config.image_versions_available = [:small, :medium, :large, :original]
+
+
+  # SMALL IMAGES
+
+  # Width limit for small images
+  # config.small_image[:width] = 160
+
+  # Height limit for small images
+  # config.small_image[:height] = 160
+
+
+  # MEDIUM IMAGES
+
+  # Width limit for medium images
+  # config.medium_image[:width] = 360
+
+  # Height limit for medium images
+  # config.medium_image[:height] = 360
+
+
+  # LARGE IMAGES
+
+  # Width limit for large images
+  # config.large_image[:width] = 760
+
+  # Height limit for large images
+  # config.large_image[:height] = 760
+
+
+  # Whether user can destroy uploaded files
+  # config.allow_destroy = true
+
+
+  # Store directory (inside of 'public')
+  # BE CAREFUL! Changing this may break previously uploaded file paths!
+  # config.store_dir = 'uploads'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: remotipart
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,10 +154,8 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
-description: Bootsy is a WYSIWIG editor for Rails applications based on WYSIHTML5
-  and Twitter Bootstrap. It integrates images uploads using CarrierWave, as an image
-  gallery scoped in models of your application.
+        version: '1.3'
+description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
 - volmerius@gmail.com
 executables: []
@@ -181,6 +179,7 @@ files:
 - app/assets/javascripts/bootsy/bootsy.js.erb
 - app/assets/stylesheets/bootsy.css
 - app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css
+- app/assets/stylesheets/bootsy/bootsy.css
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
@@ -189,16 +188,17 @@ files:
 - db/migrate/20120624171333_create_bootsy_images.rb
 - db/migrate/20120628124845_create_bootsy_image_galleries.rb
 - lib/generators/bootsy/install_generator.rb
+- lib/generators/bootsy/templates/bootsy.rb
 - lib/generators/bootsy/USAGE
 - lib/bootsy.rb
 - lib/tasks/bootsy_tasks.rake
 - lib/tasks/cucumber.rake
 - lib/bootsy/form_helper.rb
-- lib/bootsy/media_container.rb
 - lib/bootsy/version.rb
 - lib/bootsy/activerecord/image_gallery.rb
 - lib/bootsy/activerecord/image.rb
 - lib/bootsy/core_ext.rb
+- lib/bootsy/container.rb
 - lib/bootsy/form_builder.rb
 - lib/bootsy/engine.rb
 - MIT-LICENSE
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2387402174944412572
+      hash: 2323044917937113388
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,11 +227,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2387402174944412572
+      hash: 2323044917937113388
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A beautiful wysiwig editor with image uploads for Rails.
+summary: A beautiful WYSIWYG editor with image uploads for Rails.
 test_files: []