bootsy 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3fa1e33cc474133f385772500c3f1c3c7c622d4
-  data.tar.gz: 477c5ad9e850218869fc3f68c93fed33ed90d045
+  metadata.gz: 10213f792bf2d4b2a8e5a29aa80b63b21ca14e8a
+  data.tar.gz: 8786ccb949991086a701ea862ceae43898843bc8
 SHA512:
-  metadata.gz: 74a7ec62cbfb633d74b83d4c9e8ba97c74d1d605a2ca4b556acba3e4fad8b66d1d5548a3150196928ac26a96345dbc32ff38dd54c7d1f9e16ff15f194d7b016d
-  data.tar.gz: cc39af7ac32035dec2c52384d06d0aca6f40bca12926b89f8ee5b963e7282949cbb637854ac8d0eb067456efe0866c79334bf849be0faf09ea1f97d854ef8f0c
+  metadata.gz: 46477141879b70d6e6e1989aafe182fb49c70946cb8df87d9b2ccea0ecb1f8111d93574435d46ef1cea1edca58ed01af99e3e8f265bd4a4c5bf64374ea453ff1
+  data.tar.gz: e4ef2cb97c4e5b54d4b56e437c8bfff94f909443bb426efaaedf8a651d5703c21b2d53e9b5af4af586d06925440ea531d961dc872cabb6451d632218a63b6962

data/README.md

@@ -3,69 +3,76 @@
 [![Gem Version](https://badge.fury.io/rb/bootsy.png)](http://badge.fury.io/rb/bootsy)
 [![Build Status](https://secure.travis-ci.org/volmer/bootsy.png?branch=master)](http://travis-ci.org/volmer/bootsy)
 [![Dependency Status](https://gemnasium.com/volmer/bootsy.png)](https://gemnasium.com/volmer/bootsy)
+[![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/jnicklas/carrierwave).
+*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).
 
 
 ## Requirements
 
-* Ruby >= 1.9.3;
+* Ruby `2.0` or `1.9.3`;
 * ImageMagick or GraphicsMagick (for MiniMagick);
-* Rails ~> 3.2 (Rails 4 support is comming soon);
+* Rails `4.0` (you can get a *temporary* support for Rails `3.2` on [this branch](https://github.com/volmer/bootsy/tree/rails-3.2));
 * [Twitter Bootstrap](http://twitter.github.com/bootstrap/) properly added on your application.
 
 
 ## Installation
 
 1. Add Bootsy to your Gemfile:
-
-  ```ruby
-  gem 'bootsy'
-  ```
+```ruby
+gem 'bootsy'
+```
 
 2. Run the bundle command to install it:
-
-  ```console
-  bundle install
-  ```
+```console
+bundle install
+```
 
 3. Run the install generator:
-  ```console
-  rails g bootsy:install
-  ```
+```console
+rails g bootsy:install
+```
 
 4. Add and run migrations (if you're using ActiveRecord):
-  ```console
-  rake bootsy:install:migrations
-  rake db:migrate
-  ```
+```console
+rake bootsy:install:migrations
+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:
+```erb
+<%= form_for(@post) do |f| %>
+  <%= f.label :title %><br />
+  <%= f.text_field :title %>
 
-  ```erb
-  <%= form_for(@post) do |f| %>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
+  <%= f.label :content %><br />
+  <%= f.bootsy_area :content %>
 
-    <%= f.label :content %><br />
-    <%= f.bootsy_area :content %>
-    
-    <%= f.submit %>
-  <% end %>
-  ```
+  <%= f.submit %>
+<% end %>
+```
 
 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:
-
-  ```ruby
-  class Post < ActiveRecord::Base
-    include Bootsy::Container
-    
-    attr_accessible :content, :title
-  end
-  ```
+```ruby
+class Post < ActiveRecord::Base
+  include Bootsy::Container
+
+  attr_accessible :content, :title
+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:
+```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
+```
 
 ## Editor options
 
@@ -75,20 +82,18 @@ It is possible to customize how the editor is displayed and its behavior by pass
 ### Buttons
 
 You can enable/disable the buttons available on the editor. For example, if you want to disable the link and color buttons:
-
-  ```erb
-  <%= f.bootsy_area :my_attribute, editor_options: {link: false, color: false} %>
-  ```
+```erb
+<%= 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
 
 By default, Bootsy alerts for unsaved changes if the user attempts to unload the window. You can disable this behaviour by doing:
-
-  ```erb
-  <%= f.bootsy_area :my_attribute, editor_options: {alert_unsaved: false} %>
-  ```
+```erb
+<%= f.bootsy_area :my_attribute, editor_options: {alert_unsaved: false} %>
+```
 
 ## Uploader
 
@@ -117,4 +122,4 @@ Do you want to use Bootsy alongside with [SimpleForm](https://github.com/platafo
 
 ## License
 
-MIT License. Copyright 2013 Volmer Soares
+MIT License. Copyright 2013 Volmer Soares

data/Rakefile

@@ -22,10 +22,13 @@ end
 
 Bundler::GemHelper.install_tasks
 
-require "cucumber/rake/task"
+require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
+require 'coveralls/rake/task'
 
-task :default => [:spec,:run]
+Coveralls::RakeTask.new
+
+task default: [:spec,:run, 'coveralls:push']
 
 RSpec::Core::RakeTask.new(:spec)
 

data/app/assets/javascripts/bootsy.js

@@ -2,4 +2,6 @@
 //= require bootsy/wysihtml5
 //= require bootsy/bootstrap-wysihtml5
 //= require bootsy/bootsy
-//= require_tree .
+//= require bootsy/init
+//= require bootsy/editor_options
+//= require bootsy/translations

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

@@ -1,233 +1,168 @@
-window.Bootsy = (function(){
+window.Bootsy = window.Bootsy || {};
 
-  var Bootsy = {caretBookmark: false, unsavedChanges: false, editor: false, editorOptions: {}, eventCallbacks: {'loaded': []}, triggeredEvents: []};
+window.Bootsy.Area = function ($el) {
+  var self = this;
 
-  Bootsy.translations = {
-    en: {
-      alert_unsaved: 'You have unsaved changes.'
+  this.progressBar = function () {
+    self.imageGalleryModal.find('div.modal-body').html('<div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div>');
+  };
+
+  this.setImageGalleryId = function (id) {
+    self.imageGalleryModal.data('bootsy-gallery-id', id)
+    $('input.bootsy_image_gallery_id').val(id);
+  };
+
+  this.refreshGallery = function () {
+    self.progressBar();
+    $.ajax({
+      url: '/bootsy/images',
+      type: 'GET',
+      cache: false,
+      data: {
+        image_gallery_id: self.imageGalleryModal.data('bootsy-gallery-id')
+      },
+      dataType: 'json',
+      success: function (data) {
+        self.imageGalleryModal.find('div.modal-body').html(data.partial);
+        self.imageGalleryModal.find('a.refresh-btn').hide();
+      },
+      error: function (e) {
+        alert(Bootsy.translations[self.locale].error);
+        self.imageGalleryModal.find('a.refresh-btn').show();
+      }
+    });
+  };
+
+  this.openImageGallery = function (editor) {
+    editor.currentView.element.focus(false);
+    self.caretBookmark = editor.composer.selection.getBookmark();
+    $('#bootsy_image_gallery').modal('show');
+  };
+
+  this.insertImage = function (image) {
+    $('#bootsy_image_gallery').modal('hide');
+    self.editor.currentView.element.focus();
+    if (self.caretBookmark) {
+      self.editor.composer.selection.setBookmark(self.caretBookmark);
+      self.caretBookmark = null;
     }
+    self.editor.composer.commands.exec('insertImage', image);
   };
 
-  Bootsy.on = function(eventName, callback){
-    Bootsy.eventCallbacks[eventName].push(callback);
+  this.on = function (eventName, callback) {
+    self.eventCallbacks[eventName].push(callback);
   };
 
-  Bootsy.trigger = function(eventName){
-    var callbacks = Bootsy.eventCallbacks[eventName];
-    for(i in callbacks){
+  this.trigger = function (eventName) {
+    var callbacks = self.eventCallbacks[eventName];
+    for(i in callbacks) {
       callbacks[i]();
     }
-    Bootsy.triggeredEvents.push(eventName);
+    self.triggeredEvents.push(eventName);
   };
 
-  Bootsy.after = function(eventName, callback){
-    if(Bootsy.triggeredEvents.indexOf(eventName) != -1){
+  this.after = function (eventName, callback) {
+    if(self.triggeredEvents.indexOf(eventName) != -1) {
       callback();
     }else{
-      Bootsy.on(eventName, callback);
+      self.on(eventName, callback);
     }
   };
-  
-  Bootsy.progressBar = function(element){
-    element.find('div.modal-body').html('<div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div>');
-  };
 
-  Bootsy.refreshGallery = function(element){
-    element.find('a.refresh_btn').show().click();
+  this.alertUnsavedChanges = function () {
+    if (self.unsavedChanges) {
+      return Bootsy.translations[self.locale].alert_unsaved;
+    }
   };
 
-  Bootsy.openImageGallery = function(editor){
-    editor.currentView.element.focus(false);
-    Bootsy.caretBookmark = editor.composer.selection.getBookmark();
-    $('#bootsy_image_gallery').modal('show');
+  this.clear = function () {
+    self.editor.clear();
+    self.setImageGalleryId('');
   };
 
-  Bootsy.insertImage = function(image, editor){
-    $('#bootsy_image_gallery').modal('hide');
-    editor.currentView.element.focus();
-    if (Bootsy.caretBookmark) {
-      editor.composer.selection.setBookmark(Bootsy.caretBookmark);
-      Bootsy.caretBookmark = null;
-    }
-    editor.composer.commands.exec("insertImage", image);
+  this.locale = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
+  this.caretBookmark = false;
+  this.unsavedChanges = false;
+  this.editor = false;
+  this.eventCallbacks = {'loaded': []};
+  this.triggeredEvents = [];
+  this.editorOptions = {locale: this.locale};
+
+  if ($el.data('bootsy-font-styles') === false) this.editorOptions['font-styles'] = false;
+  if ($el.data('bootsy-emphasis') === false) this.editorOptions.emphasis = false;
+  if ($el.data('bootsy-lists') === false) this.editorOptions.lists = false;
+  if ($el.data('bootsy-html') === true) this.editorOptions.html = true;
+  if ($el.data('bootsy-link') === false) this.editorOptions.link = false;
+  if ($el.data('bootsy-color') === false) this.editorOptions.color = false;
+
+  if ($el.data('bootsy-alert-unsaved') !== false) {
+    window.onbeforeunload = this.alertUnsavedChanges;
   }
 
-  Bootsy.alertUnsavedChanges = function(){
-    if(Bootsy.unsavedChanges){  
-      return Bootsy.translations[Bootsy.locale].alert_unsaved; 
-    }
-  };
-
-  Bootsy.ready = function(){
-    if($('textarea.bootsy_text_area').length > 0){
-      Bootsy.locale = $('textarea.bootsy_text_area').attr('data-bootsy-locale') || $('html').attr('lang') || 'en';
-
-      var templates = {
-        customCommand: function(locale, options) {
+  $el.closest('form').submit(function (e) {
+    self.unsavedChanges = false;
+    return true;
+  });
+
+  if ($el.data('bootsy-image') !== false) {
+    if ($el.data('bootsy-uploader') !== false) {
+      this.editorOptions.image = false;
+      this.editorOptions.customCommand = true;
+      this.editorOptions.customCommandCallback = this.openImageGallery;
+      this.editorOptions.customTemplates = {
+        customCommand: function (locale, options) {
           var size = (options && options.size) ? ' btn-'+options.size : '';
           return "<li>" +
             "<a class='btn" + size + "' data-wysihtml5-command='customCommand' title='" + locale.image.insert + "' tabindex='-1'><i class='icon-picture'></i></a>" +
           "</li>";
-        },
+        }
       };
 
-      Bootsy.editorOptions = {
-        parserRules: {
-          classes: {
-            "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":  {},
-            "br": {},
-            "ol": {},
-            "ul": {},
-            "li": {},
-            "h1": {},
-            "h2": {},
-            "h3": {},
-            "small": {},
-            "p": {},
-            "blockquote": {},
-            "u": 1,
-            "cite": {
-              "check_attributes": {
-                "title": "alt"
-              }
-            },
-            "img": {
-              "check_attributes": {
-                "width": "numbers",
-                "alt": "alt",
-                "src": "src",
-                "height": "numbers"
-              },
-              "add_class": {
-                "align": "align_img"
-              }
-            },
-
-            "a":  {
-              set_attributes: {
-                target: "_blank",
-                rel:    "nofollow"
-              },
-              check_attributes: {
-                href:   "url" // important to avoid XSS
-              }
-            },
-            "span": 1,
-            "div": 1,
-            // to allow save and edit files with code tag hacks
-            "code": 1,
-            "pre": 1
-          }
-        },
-        color: true, 
-        locale: Bootsy.locale, 
-        customTemplates: templates
-      };
+      this.imageGalleryModal = $('#bootsy_image_gallery');
 
-      Bootsy.editorOptions.stylesheets = ["/assets/bootsy/bootsy.css"];
-
-      if($('textarea.bootsy_text_area').attr('data-bootsy-image') == 'false'){
-        Bootsy.editorOptions.image = false;
-      }else{
-
-        if($('textarea.bootsy_text_area').attr('data-bootsy-uploader') != 'false'){
-          Bootsy.editorOptions.image = false;
-          Bootsy.editorOptions.customCommand = true;
-          Bootsy.editorOptions.customCommandCallback = Bootsy.openImageGallery;
-
-          element = $('#bootsy_image_gallery');
-        
-          element.parents('form').after(element);
-
-          element.on('click', 'a.refresh_btn', function(e){
-            $(this).hide();
-            Bootsy.progressBar(element);
-          });
-
-          element.find('a.destroy_btn').click(function(e){
-            Bootsy.progressBar(element);
-          });
-
-          element.modal({show: false});
-          element.on('shown', function(){
-            Bootsy.refreshGallery(element);
-          });
-
-          element.on('hide', function() {
-            Bootsy.editor.currentView.element.focus();
-          });
-
-          element.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-            e.stopPropagation();
-          });
-
-          element.on('click', 'ul.dropdown-menu a.insert', 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);
-          });
-        }
-      }
+      this.imageGalleryModal.parents('form').after(this.imageGalleryModal);
 
-      if($('textarea.bootsy_text_area').attr('data-bootsy-font-styles') == 'false') Bootsy.editorOptions['font-styles'] = false;
-      if($('textarea.bootsy_text_area').attr('data-bootsy-emphasis') == 'false') Bootsy.editorOptions.emphasis = false;
-      if($('textarea.bootsy_text_area').attr('data-bootsy-lists') == 'false') Bootsy.editorOptions.lists = false;
-      if($('textarea.bootsy_text_area').attr('data-bootsy-html') == 'true') Bootsy.editorOptions.html = true;
-      if($('textarea.bootsy_text_area').attr('data-bootsy-link') == 'false') Bootsy.editorOptions.link = false;
-      if($('textarea.bootsy_text_area').attr('data-bootsy-color') == 'false') Bootsy.editorOptions.color = false;
+      this.imageGalleryModal.on('click', 'a[href="#refresh-gallery"]', this.refreshGallery);
 
-      Bootsy.editor = $('textarea.bootsy_text_area').wysihtml5(Bootsy.editorOptions).data("wysihtml5").editor;
+      this.imageGalleryModal.find('a.destroy_btn').click(this.progressBar);
 
-      if($('textarea.bootsy_text_area').attr('data-bootsy-alert-unsaved') != 'false'){
-        window.onbeforeunload = Bootsy.alertUnsavedChanges;
-      }
+      this.imageGalleryModal.modal({show: false});
+      this.imageGalleryModal.on('shown', this.refreshGallery);
 
-      Bootsy.editor.on("change", function(){
-        Bootsy.unsavedChanges = true;
+      this.imageGalleryModal.on('hide', function () {
+        self.progressBar();
+        self.editor.currentView.element.focus();
       });
 
-      $('textarea.bootsy_text_area').closest('form').submit(function(e){
-        Bootsy.unsavedChanges = false;
-        return true;
+      this.imageGalleryModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function (e) {
+        e.stopPropagation();
       });
 
-      Bootsy.trigger('loaded');
+      this.imageGalleryModal.on('click', 'ul.dropdown-menu a.insert', function (e) {
+        var imagePrefix = "/"+$(this).attr('data-image-size')+"_";
+        if($(this).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).data('position');
+
+        self.insertImage(obj);
+      });
     }
-  };
+  } else {
+    this.editorOptions.image = false;
+  }
+
+  this.editor = $el.wysihtml5($.extend(Bootsy.editorOptions, this.editorOptions)).data('wysihtml5').editor;
 
-  return Bootsy;
-}).call(this);
+  this.editor.on('change', function () {
+    self.unsavedChanges = true;
+  });
 
-$(Bootsy.ready);
+  this.trigger('loaded');
+};

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

@@ -0,0 +1,80 @@
+window.Bootsy = window.Bootsy || {};
+
+var page_stylesheets = [];
+$('link[rel="stylesheet"]').each(function () {
+  page_stylesheets.push($(this).attr('href'));
+});
+
+window.Bootsy.editorOptions = {
+  parserRules: {
+    classes: {
+      "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":  {},
+      "br": {},
+      "ol": {},
+      "ul": {},
+      "li": {},
+      "h1": {},
+      "h2": {},
+      "h3": {},
+      "small": {},
+      "p": {},
+      "blockquote": {},
+      "u": 1,
+      "cite": {
+        "check_attributes": {
+          "title": "alt"
+        }
+      },
+      "img": {
+        "check_attributes": {
+          "width": "numbers",
+          "alt": "alt",
+          "src": "src",
+          "height": "numbers"
+        },
+        "add_class": {
+          "align": "align_img"
+        }
+      },
+
+      "a":  {
+        set_attributes: {
+          target: "_blank",
+          rel:    "nofollow"
+        },
+        check_attributes: {
+          href:   "url" // important to avoid XSS
+        }
+      },
+      "span": 1,
+      "div": 1,
+      // to allow save and edit files with code tag hacks
+      "code": 1,
+      "pre": 1
+    }
+  },
+  color: true,
+  stylesheets: page_stylesheets
+};

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

@@ -0,0 +1,8 @@
+window.Bootsy = window.Bootsy || {};
+
+$(function(){
+  Bootsy.areas = [];
+  $('textarea.bootsy_text_area').each(function() {
+    Bootsy.areas.push(new Bootsy.Area($(this)));
+  });
+});

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

@@ -0,0 +1,8 @@
+window.Bootsy = window.Bootsy || {};
+
+window.Bootsy.translations = {
+  en: {
+    alert_unsaved: 'You have unsaved changes.',
+    error: 'Something went very wrong. Please try again later.'
+  }
+};

data/app/controllers/bootsy/application_controller.rb

@@ -1,4 +1,7 @@
 module Bootsy
   class ApplicationController < ActionController::Base
+    # Prevent CSRF attacks by raising an exception.
+    # For APIs, you may want to use :null_session instead.
+    protect_from_forgery with: :exception
   end
 end

data/app/controllers/bootsy/images_controller.rb

@@ -9,9 +9,13 @@ module Bootsy
       @images = @gallery.images
 
       respond_to do |format|
-        format.js
         format.html # index.html.erb
-        format.json { render json: @images }
+        format.json do
+          partial_str = render_to_string(file: 'bootsy/images/_index',
+                                          formats: [:html],
+                                          locals: { gallery: @gallery })
+          render json: { partial: partial_str }
+        end
       end
     end
 
@@ -20,12 +24,11 @@ module Bootsy
     def create
       @gallery = find_gallery
       @gallery.save! unless @gallery.persisted?
-      @image = Image.new params[:image]
+      @image = Image.new image_params
       @image.image_gallery_id = @gallery.id
-      @images = @gallery.images
-  
+
       respond_to do |format|
-        if @image.save  
+        if @image.save
           format.js
           format.json { render json: @image, status: :created, location: @image }
         else
@@ -34,13 +37,13 @@ module Bootsy
         end
       end
     end
-  
+
     # DELETE /images/1
     # DELETE /images/1.json
     def destroy
       @image = Image.find(params[:id])
       @image.destroy
-  
+
       respond_to do |format|
         format.js
         format.html { redirect_to images_url }
@@ -50,11 +53,14 @@ module Bootsy
 
     private
     def find_gallery
-      begin 
-        return ImageGallery.find params[:image_gallery_id]
-      rescue
-        return ImageGallery.new
-      end
+      ImageGallery.find params[:image_gallery_id]
+    rescue
+      ImageGallery.new
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def image_params
+      params.require(:image).permit(:image_file)
     end
   end
 end

data/app/helpers/bootsy/application_helper.rb

@@ -1,12 +1,11 @@
 module Bootsy
   module ApplicationHelper
-    def refresh_btn gallery, collection
-      link_to t('bootsy.action.refresh'), [bootsy, resource_or_nil(gallery), collection], remote: true, :class => 'btn btn-mini refresh_btn'
+    def refresh_btn
+      link_to t('bootsy.action.refresh'), '#refresh-gallery', class: 'btn btn-mini refresh-btn'
     end
 
     def resource_or_nil resource
-      resource = nil unless resource.nil? || resource.persisted?
-      resource
+      resource if resource.present? && resource.persisted?
     end
   end
 end

data/app/uploaders/bootsy/image_uploader.rb

@@ -1,40 +1,35 @@
 # encoding: utf-8
 module Bootsy
   class ImageUploader < CarrierWave::Uploader::Base
-
     include CarrierWave::MiniMagick
 
-    include Sprockets::Helpers::RailsHelper
-    include Sprockets::Helpers::IsolatedHelper
-
-    storage :file
-
+    storage Bootsy.storage
 
     def store_dir
       "#{Bootsy.store_dir}/#{model.class.to_s.underscore}/#{model.id}"
     end
 
     # Process files as they are uploaded:
-    process :resize_to_limit => [1160, 2000]
+    process resize_to_limit: [1160, 2000]
 
     version :large do
-      process :resize_to_fit => [Bootsy.large_image[:width], Bootsy.large_image[:height]]
+      process resize_to_fit: [Bootsy.large_image[:width], Bootsy.large_image[:height]]
     end
 
     version :medium do
-      process :resize_to_fit => [Bootsy.medium_image[:width], Bootsy.medium_image[:height]]
+      process resize_to_fit: [Bootsy.medium_image[:width], Bootsy.medium_image[:height]]
     end
 
     version :small do
-      process :resize_to_fit => [Bootsy.small_image[:width], Bootsy.small_image[:height]]
+      process resize_to_fit: [Bootsy.small_image[:width], Bootsy.small_image[:height]]
     end
 
     version :thumb do
-      process :resize_to_fill => [60, 60]
+      process resize_to_fill: [60, 60]
     end
 
     def extension_white_list
       %w(jpg jpeg gif png)
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 <ul class="thumbnails">
-  <% images.each do |image| %>
+  <% gallery.images.each do |image| %>
     <li class="span1 dropdown">
       <%= link_to image_tag(image.image_file.thumb.url), '#', :class => 'thumbnail', data: { toggle: 'dropdown'} %>
       <ul class="dropdown-menu" role="menu">
@@ -35,8 +35,8 @@
   <% end %>
 </ul>
 
-<%= refresh_btn gallery, :images %>
+<%= refresh_btn %>
 
 <hr />
 
-<%= render 'bootsy/images/new', {image: (defined?(image) && image.errors.any?) ? image : gallery.images.new } %>
+<%= render 'bootsy/images/new', {image: (defined?(image) && image.errors.any?) ? image : gallery.images.new } %>

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

@@ -1,12 +1,12 @@
-<div class="modal hide fade" id="bootsy_image_gallery">
+<div class="modal hide fade" id="bootsy_image_gallery" data-no-turbolink data-bootsy-gallery-id="<%= container.bootsy_image_gallery_id %>">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal">×</button>
     <h2><%= t 'bootsy.image.p' %></h2>
   </div>
   <div class="modal-body">
-    <%= refresh_btn container.bootsy_image_gallery, :images %>
+    <%= refresh_btn %>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal"><%= t 'bootsy.action.close' %></a>
   </div>
-</div>
+</div>

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

@@ -1,6 +1,7 @@
 <h3><%= t 'bootsy.image.new' %></h3>
 
 <%= form_for [bootsy, resource_or_nil(image.image_gallery), image], remote: true, html: {:class => 'bootsy form-inline'} do |f| %>
+  <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
   <% if image.errors.any? %>
     <% image.errors.full_messages.each do |msg| %>
       <div class="alert alert-error"><%= msg %></div>

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

@@ -1,3 +1,2 @@
-$('input.bootsy_image_gallery_id').val("<%= @gallery.id %>");
-$('#bootsy_image_gallery div.modal-body').html("<%= j render 'bootsy/images/index', {images: @images, gallery: @gallery, image: @image}%>");
-$('#bootsy_image_gallery a.refresh_btn').hide();
+Bootsy.areas[0].setImageGalleryId(<%= @gallery.id %>);
+Bootsy.areas[0].refreshGallery();

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

@@ -1 +1 @@
-Bootsy.refreshGallery($('#bootsy_image_gallery'));
+Bootsy.areas[0].refreshGallery($('#bootsy_image_gallery'));

data/lib/bootsy.rb

@@ -37,7 +37,11 @@ module Bootsy
   mattr_accessor :original_image
   @@original_image = {}
 
-  # Store directory (inside of 'public')
+  # Storage mode
+  mattr_accessor :storage
+  @@storage = :file
+
+  # Store directory (inside 'public')
   mattr_accessor :store_dir
   @@store_dir = 'uploads'
 

data/lib/bootsy/activerecord/image.rb

@@ -4,8 +4,6 @@ module Bootsy
 
     mount_uploader :image_file, ImageUploader
 
-    attr_accessible :image_file
-
     validates_presence_of :image_file, :image_gallery_id
   end
 end

data/lib/bootsy/activerecord/image_gallery.rb

@@ -2,5 +2,7 @@ module Bootsy
   class ImageGallery < ActiveRecord::Base
     belongs_to :bootsy_resource, polymorphic: true
     has_many :images, dependent: :destroy
+
+    scope :destroy_orphans, ->(time_limit) { where('created_at < ? AND bootsy_resource_id IS NULL', time_limit).destroy_all }
   end
 end

data/lib/bootsy/container.rb

@@ -1,20 +1,19 @@
 require 'active_support/concern'
 
 module Bootsy
-  module Container 
+  module Container
 
     extend ActiveSupport::Concern
-    
+
     included do
       class_eval do
-        has_one :bootsy_image_gallery, :class_name => 'Bootsy::ImageGallery', as: :bootsy_resource, dependent: :destroy
-        attr_accessible :bootsy_image_gallery_id
+        has_one :bootsy_image_gallery, class_name: 'Bootsy::ImageGallery', as: :bootsy_resource, dependent: :destroy
 
         def bootsy_image_gallery_id
           if self.bootsy_image_gallery.nil?
-            return nil
+            nil
           else
-            return self.bootsy_image_gallery.id
+            self.bootsy_image_gallery.id
           end
         end
 
@@ -29,4 +28,4 @@ module Bootsy
       end
     end
   end
-end
+end

data/lib/bootsy/form_helper.rb

@@ -18,7 +18,7 @@ module Bootsy
           output += self.hidden_field object_name(object), :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id'
         end
       end
-      
+
       output
     end
 
@@ -60,4 +60,4 @@ module Bootsy
       (options[:data] || {}).merge Hash[bootsy_options.map{|k,v|["bootsy-#{k}",v]}]
     end
   end
-end
+end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.2.1"
+  VERSION = '1.0.0'
 end

data/lib/generators/bootsy/install_generator.rb

@@ -14,13 +14,13 @@ module Bootsy
       def add_assets
 
         [{original: 'app/assets/javascripts/application.js',
-          skip_if: 'require bootsy', 
-          content: "//= require bootsy\n", 
-          position: {before: '//= require_tree .'}},
+          skip_if: 'require bootsy',
+          content: "\n//= require bootsy",
+          position: {after: '//= require jquery_ujs'}},
          {original: 'app/assets/stylesheets/application.css',
-          skip_if: 'require bootsy', 
-          content: "*= require bootsy\n", 
-          position: {before: '*/'}}]. each do |params|
+          skip_if: 'require bootsy',
+          content: "\n *= require bootsy",
+          position: {after: '*= require_self'}}]. each do |params|
 
           if File.binread(params[:original]).include?(params[:skip_if])
             say_status 'skipped', "insert into #{params[:original]}", :yellow
@@ -37,4 +37,4 @@ module Bootsy
 
     end
   end
-end
+end

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

@@ -48,7 +48,17 @@ Bootsy.setup do |config|
   # config.allow_destroy = true
 
 
-  # Store directory (inside of 'public')
+  # Storage mode
+  # You can change the sorage mode below from :file to :fog if you want
+  # to use Amazon S3 and other cloud services. If you do that, please add
+  # 'fog' to your Gemfile and create and configure your credentials in an
+  # initializer file, as described in Carrierwave's docs:
+  # https://github.com/carrierwaveuploader/carrierwave/blob/master/README.md#using-amazon-s3
+  #
+  # config.storage = :file
+
+
+  # Store directory (inside 'public') for storage = :file
   # BE CAREFUL! Changing this may break previously uploaded file paths!
   # config.store_dir = 'uploads'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.33'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.33'
 description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
 - volmerius@gmail.com
@@ -129,46 +143,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/uploaders/bootsy/image_uploader.rb
-- app/views/bootsy/images/index.js.erb
-- app/views/bootsy/images/_index.html.erb
-- app/views/bootsy/images/destroy.js.erb
-- app/views/bootsy/images/create.js.erb
-- app/views/bootsy/images/_modal.html.erb
-- app/views/bootsy/images/_new.html.erb
-- app/controllers/bootsy/application_controller.rb
-- app/controllers/bootsy/images_controller.rb
-- app/helpers/bootsy/application_helper.rb
-- app/assets/javascripts/bootsy.js
+- app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
+- app/assets/javascripts/bootsy/bootsy.js
+- app/assets/javascripts/bootsy/editor_options.js
+- app/assets/javascripts/bootsy/init.js
 - app/assets/javascripts/bootsy/locales/bootstrap-wysihtml5.pt-BR.js
 - app/assets/javascripts/bootsy/locales/bootsy.pt-BR.js
-- app/assets/javascripts/bootsy/bootsy.js
+- app/assets/javascripts/bootsy/translations.js
 - app/assets/javascripts/bootsy/wysihtml5.js
-- app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
-- app/assets/stylesheets/bootsy.css
+- app/assets/javascripts/bootsy.js
 - app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootsy/bootsy.css
+- app/assets/stylesheets/bootsy.css
+- app/controllers/bootsy/application_controller.rb
+- app/controllers/bootsy/images_controller.rb
+- app/helpers/bootsy/application_helper.rb
+- app/uploaders/bootsy/image_uploader.rb
+- app/views/bootsy/images/_index.html.erb
+- app/views/bootsy/images/_modal.html.erb
+- app/views/bootsy/images/_new.html.erb
+- app/views/bootsy/images/create.js.erb
+- app/views/bootsy/images/destroy.js.erb
+- config/bootsy.yml
+- config/cucumber.yml
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
-- config/bootsy.yml
-- config/cucumber.yml
 - db/migrate/20120624171333_create_bootsy_images.rb
 - db/migrate/20120628124845_create_bootsy_image_galleries.rb
+- lib/bootsy/activerecord/image.rb
+- lib/bootsy/activerecord/image_gallery.rb
+- lib/bootsy/container.rb
+- lib/bootsy/core_ext.rb
+- lib/bootsy/engine.rb
+- lib/bootsy/form_builder.rb
+- lib/bootsy/form_helper.rb
+- lib/bootsy/version.rb
+- lib/bootsy.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/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
 - Rakefile
 - README.md

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

@@ -1,2 +0,0 @@
-$('#bootsy_image_gallery div.modal-body').html("<%= j render 'bootsy/images/index', {images: @images, gallery: @gallery}%>");
-$('#bootsy_image_gallery a.refresh_btn').hide();