bootsy 1.2.0 → 2.0.0

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

@@ -1,11 +1,11 @@
 window.Bootsy = window.Bootsy || {};
 
-var page_stylesheets = [];
+var pageStylesheets = [];
 $('link[rel="stylesheet"]').each(function () {
-  page_stylesheets.push($(this).attr('href'));
+  pageStylesheets.push($(this).attr('href'));
 });
 
-window.Bootsy.editorOptions = {
+window.Bootsy.options = {
   parserRules: {
     classes: {
       "wysiwyg-color-silver" : 1,
@@ -76,5 +76,5 @@ window.Bootsy.editorOptions = {
     }
   },
   color: true,
-  stylesheets: page_stylesheets
+  stylesheets: pageStylesheets
 };

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

@@ -4,7 +4,10 @@ Bootsy.init = function() {
   Bootsy.areas = [];
 
   $('textarea.bootsy_text_area').each(function() {
-    Bootsy.areas.push(new Bootsy.Area($(this)));
+    var area = new Bootsy.Area($(this));
+    area.init();
+
+    Bootsy.areas.push(area);
   });
 };
 

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

@@ -3,6 +3,7 @@
  */
 jQuery(function(){
   Bootsy.translations['pt-BR'] = {
-    alert_unsaved: 'As suas modificações ainda não foram gravadas.'
+    alertUnsaved: 'As suas modificações ainda não foram gravadas.',
+    error: 'Algo deu errado. Por favor, tente novamente.'
   };
-});
+});

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

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

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

@@ -0,0 +1,47 @@
+.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;
+}

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

@@ -72,10 +72,6 @@
   margin: 0 0 8px 8px;
 }
 
-form.bootsy .field_with_errors { 
-  display: inline-block; 
-}
-
 blockquote {
   padding: 0 0 0 15px;
   margin: 0 0 20px;
@@ -84,9 +80,6 @@ blockquote {
 
 blockquote p {
   margin-bottom: 0;
-  /*font-size: 16px;
-  font-weight: 300;
-  line-height: 25px;*/
 }
 
 blockquote small {
@@ -131,38 +124,27 @@ textarea.bootsy:required:invalid {
   color: inherit;
 }
 
-/*Allow dropdown menus to show be displayed if they overflow the footer or modal*/
-#bootsy_image_gallery .modal { overflow: visible; }
-#bootsy_image_gallery .modal-body { overflow-y: visible; }
-
 /*Modal Design Styles*/
-#bootsy_image_gallery form { margin-bottom: 0px; } /*remove default bottom margin*/
-#bootsy_image_gallery .file-input-name {display: none;}  /*Hide the input file name from showing as it's not needed and ruins design*/
+
+.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_image_gallery .modal-body {
-  min-height: 78px;
-  margin-bottom: 0;
-  padding-bottom: 7px;
-}
-#bootsy_image_gallery .modal-body .thumbnails {
-  margin-left: -10px;
-  margin-bottom: 0;
-}
-#bootsy_image_gallery .modal-body .thumbnails > li {
-  margin-left: 7px;
-  margin-bottom: 8px;
+.bootsy-modal .modal-body {
+  min-height: 120px;
 }
 
-#bootsy_image_gallery .modal-body .thumbnails > li.alert {
-  width: 100%;
-  margin-right: 8px;
+.bootsy-image {
+  margin-bottom: 15px;
 }
-.bootsy-spinner {
+
+.bootsy-upload-loader {
   display: inline-block;
   padding-right: 5px;
 }
-.bootsy-spinner img {
-  display: none;
+
+.bootsy-gallery-loader {
+  display: block;
+  margin: 0 auto;
 }
 
 /*The below code is needed for capybara to be able to find the input, as it*/
@@ -170,3 +152,10 @@ textarea.bootsy:required:invalid {
 .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;
+}

data/app/controllers/bootsy/images_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "bootsy/application_controller"
+require_dependency 'bootsy/application_controller'
 
 module Bootsy
   class ImagesController < Bootsy::ApplicationController
@@ -11,10 +11,19 @@ module Bootsy
       respond_to do |format|
         format.html # index.html.erb
         format.json do
-          partial_str = render_to_string(file: 'bootsy/images/_index',
+          rendered_images = []
+
+          @images.each do |image|
+            rendered_images << render_to_string(file: 'bootsy/images/_image',
                                           formats: [:html],
-                                          locals: { gallery: @gallery })
-          render json: { partial: partial_str }
+                                          locals: { image: image })
+          end
+
+          new_image = render_to_string(file: 'bootsy/images/_new',
+                                        formats: [:html],
+                                        locals: { gallery: @gallery, image: @gallery.images.new })
+
+          render json: { images: rendered_images, form: new_image }
         end
       end
     end
@@ -29,10 +38,16 @@ module Bootsy
 
       respond_to do |format|
         if @image.save
-          format.js
-          format.json { render json: @image, status: :created, location: @image }
+          image_view = render_to_string(file: 'bootsy/images/_image',
+                                        formats: [:html],
+                                        locals: { image: @image })
+
+          new_image = render_to_string(file: 'bootsy/images/_new',
+                                        formats: [:html],
+                                        locals: { gallery: @gallery, image: @gallery.images.new })
+
+          format.json { render json: { image: image_view, form: new_image, gallery_id: @gallery.id } }
         else
-          format.js
           format.json { render json: @image.errors, status: :unprocessable_entity }
         end
       end
@@ -45,9 +60,8 @@ module Bootsy
       @image.destroy
 
       respond_to do |format|
-        format.js
+        format.json { render json: { id: params[:id] } }
         format.html { redirect_to images_url }
-        format.json { head :no_content }
       end
     end
 

data/app/helpers/bootsy/application_helper.rb

@@ -1,7 +1,7 @@
 module Bootsy
   module ApplicationHelper
     def refresh_btn
-      link_to t('bootsy.action.refresh'), '#refresh-gallery', class: 'btn btn-mini refresh-btn'
+      link_to t('bootsy.action.refresh'), '#refresh-gallery', class: 'btn btn-default btn-sm refresh-btn'
     end
 
     def resource_or_nil resource

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

@@ -0,0 +1,43 @@
+<div class="bootsy-image dropdown col-md-2" data-id="<%= image.id %>">
+  <%= link_to image_tag(image.image_file.thumb.url), '#', class: 'thumbnail',
+    data: { toggle: 'dropdown' } %>
+
+  <ul class="dropdown-menu" role="menu">
+    <li role="presentation" class="dropdown-header"><%= t 'bootsy.image.size' %></li>
+
+    <% Bootsy.image_versions_available.each do |size| %>
+      <li role="presentation" class="dropdown dropdown-submenu">
+        <%= link_to '#', tabindex: '-1', role: 'menuitem', data: { toggle: 'dropdown' } do %>
+          <i class="icon-picture"></i>
+
+          <%= t size, scope: 'bootsy.image' %>
+        <% end %>
+
+        <ul class="dropdown-menu" role="menu">
+          <% [:left, :right, :inline].each do |position| %>
+            <li role="presentation">
+              <%= link_to '#', class: 'insert', tabindex: '-1', role: 'menuitem',
+                data: { image_size: size.to_s, position: position.to_s} do %>
+                <%= t position, scope: 'bootsy.image.position' %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
+    <% end %>
+
+    <% if Bootsy.allow_destroy %>
+      <li role="presentation" class="divider"></li>
+
+      <li role="presentation">
+        <%= link_to image, method: :delete, remote: true,
+          data: { confirm: t('bootsy.image.confirm.destroy'), type: 'json' },
+          tabindex: '-1', role: 'menuitem', class: 'destroy-btn' do %>
+          <i class="icon-trash"></i>
+
+          <%= t('bootsy.action.destroy') %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+</div>

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

@@ -1,13 +1,28 @@
-<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>
-    <h3><%= t 'bootsy.image.p' %></h3>
-    <%= refresh_btn %>
-  </div>
-  <div class="modal-content">
-    <div class="modal-body">
-    </div>
-    <div class="modal-footer">
+<div class="modal fade bootsy-modal"  tabindex="-1"
+  role="dialog" aria-hidden="true" data-no-turbolink
+  data-gallery-id="<%= container.bootsy_image_gallery_id %>">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+
+        <h3 class="modal-title"><%= t 'bootsy.image.p' %></h3>
+      </div>
+
+      <div class="modal-body">
+        <div class="alert bootsy-empty-alert">
+          <%= t 'bootsy.no_images_uploaded' %>
+        </div>
+
+        <div class="row bootsy-gallery"></div>
+
+        <%= image_tag 'bootsy/gallery-loader.gif', class: 'bootsy-gallery-loader' %>
+
+        <%= refresh_btn %>
+      </div>
+
+      <div class="modal-footer">
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,16 +1,8 @@
-<%= form_for [bootsy, resource_or_nil(image.image_gallery), image], remote: true, html: {:class => 'bootsy form-inline'} do |f| %>
+<%= form_for([bootsy, resource_or_nil(gallery), image], remote: true,
+  html: { multipart: true, class: 'bootsy-upload-form form-inline' }, data: { type: 'json' }) 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>
-    <% end %>
-  <% end %>
 
-  <div class="bootsy-spinner">
-    <%= image_tag "bootsy/ajax-loader.gif" %>
-  </div>
-  
-  <%= f.file_field :image_file, title: t('bootsy.action.upload') %>
+  <%= image_tag 'bootsy/upload-loader.gif', class: 'bootsy-upload-loader' %>
 
-  <%= f.submit t('bootsy.action.load'), id: 'upload_submit', :class => 'btn btn-primary' %>
+  <%= f.file_field :image_file, title: t('bootsy.action.upload') %>
 <% end %>

data/lib/bootsy.rb

@@ -13,7 +13,15 @@ module Bootsy
 
   # Default editor options
   mattr_accessor :editor_options
-  @@editor_options = {}
+  @@editor_options = {
+    font_styles: true,
+    emphasis: true,
+    lists: true,
+    html: false,
+    link: true,
+    image: true,
+    color: true
+  }
 
   # Image versions available
   mattr_accessor :image_versions_available

data/lib/bootsy/form_helper.rb

@@ -1,21 +1,21 @@
 module Bootsy
   module FormHelper
     def bootsy_area(object, method, options = {})
-      container = options.delete :container
-      enable_uploader = enable_uploader? object, options.delete(:uploader), container
+      container = options.delete(:container)
       bootsy_options = Bootsy.editor_options.merge(options.delete(:editor_options) || {})
-      bootsy_options[:uploader] = false unless enable_uploader
 
-      options[:data] = data_options options, bootsy_options
-      options[:class] = class_attr options
+      bootsy_options[:uploader] = enable_uploader?(object, options.delete(:uploader), container)
 
-      output = self.text_area object_name(object), method, options
+      options[:data] = data_options(options, bootsy_options)
+      options[:class] = class_attr(options)
 
-      if enable_uploader
-        output += self.render 'bootsy/images/modal', {container: container || object}
+      output = self.text_area(object_name(object), method, options)
+
+      if bootsy_options[:uploader]
+        output += self.render 'bootsy/images/modal', { container: container || object }
 
         if container.blank? || (container == object)
-          output += self.hidden_field object_name(object), :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id'
+          output += self.hidden_field(object_name(object), :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id')
         end
       end
 
@@ -57,7 +57,7 @@ module Bootsy
     end
 
     def data_options(options, bootsy_options)
-      (options[:data] || {}).merge Hash[bootsy_options.map{|k,v|["bootsy-#{k}",v]}]
+      (options[:data] || {}).merge Hash[ bootsy_options.map { |k,v| ["bootsy-#{k}", v] } ]
     end
   end
 end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = '1.2.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.35'
+        version: '2.37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.35'
+        version: '2.37'
 description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
 - volmerius@gmail.com
@@ -143,7 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/bootsy/ajax-loader.gif
+- app/assets/images/bootsy/gallery-loader.gif
+- app/assets/images/bootsy/upload-loader.gif
 - app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
 - app/assets/javascripts/bootsy/bootstrap.file-input.js
 - app/assets/javascripts/bootsy/bootsy.js
@@ -154,6 +155,7 @@ files:
 - app/assets/javascripts/bootsy/translations.js
 - app/assets/javascripts/bootsy/wysihtml5.js
 - app/assets/javascripts/bootsy.js
+- app/assets/stylesheets/bootsy/bootstrap-submenu.css
 - app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootsy/bootsy.css
 - app/assets/stylesheets/bootsy.css
@@ -161,12 +163,9 @@ files:
 - 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/_image.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
@@ -210,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: A beautiful WYSIWYG editor with image uploads for Rails.