bootsy 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 000c431fdbdf268b93ef584550157a86e614cf7d
-  data.tar.gz: ac3417b829147f272c288dd1bb52a5dac9b1cd21
+  metadata.gz: ecb062c39cbffa271dda6803ef4bcaa1a302d88d
+  data.tar.gz: c5afb0b14abb89b4ee1091b79c2907144fd597f8
 SHA512:
-  metadata.gz: b962a45cef1d7220f15f2900a891a87e9c0df7b5de7b45fb607f09a40a97cf6dbc418ce126d78d9fd4d7205982d5557d7bca9d9f0574ce7a9194ec189b75753f
-  data.tar.gz: 1039372deb799338efc78711bf79c0bd54730a951617fc10866d016598b9ee6bc0774d4e66c71a96cba42c7726e29a476825c2d7b3ce8e176e16f419ae1abf38
+  metadata.gz: e9cf8f084c8eadd962250214c5e7a9da48242c879bf443bfd64fd27120dbcf6ec593b71a0fcfe2934df5106a889b3fbcfb3334710b546d2724650c88531a7315
+  data.tar.gz: b172836a39271c1534adbb592757547467ff365536f58973411004bad06762a306837f8b5864e6f99762478ce6ed76eb17828c70f780609bbab24c04b08fe858

data/README.md

@@ -113,7 +113,7 @@ You can enable and disable features as you like. For instance, if you don't want
 Available options are: `:font_styles`, `:emphasis`, `:lists`, `:html`, `:link`, `:image` and `:color`.
 
 
-### Alert of usaved changes
+### Alert of unsaved changes
 
 By default Bootsy alerts the user about unsaved changes if the page is closed or reloaded. You can disable 
 this feature with:

data/app/assets/javascripts/bootsy.js

@@ -1,8 +1,9 @@
 //= require jquery.remotipart
+//= require bootsy/polyfill
 //= require bootsy/wysihtml5
 //= require bootsy/bootstrap-wysihtml5
 //= require bootsy/bootsy
-//= require bootsy/bootstrap.file-input.js
+//= require bootsy/bootstrap.file-input
 //= require bootsy/init
 //= require bootsy/editor_options
 //= require bootsy/translations

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

@@ -5,8 +5,11 @@ window.Bootsy = window.Bootsy || {};
 Bootsy.Area = function($el) {
   this.$el            = $el;
   this.modal          = $el.siblings('.bootsy-modal');
-  this.locale         = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
   this.unsavedChanges = false;
+  this.locale         = $el.data('bootsy-locale') || $('html').attr('lang');
+  if (!Bootsy.translations[this.locale]) {
+    this.locale = 'en';
+  }
 
   this.options = {
     locale: this.locale,
@@ -100,6 +103,20 @@ Bootsy.Area.prototype.setUploadForm = function(html) {
   }.bind(this));
 };
 
+// The image upload failed
+Bootsy.Area.prototype.imageUploadFailed = function(e, xhr, status, error) {
+  this.invalidErrors = xhr.responseJSON;
+  if (Number(xhr.status) === 422 && this.invalidErrors.image_file) {
+    this.hideUploadLoadingAnimation();
+    if (this.validation) this.validation.remove();
+    this.validation = $("<p class='text-danger'>");
+    this.validation.text(this.invalidErrors.image_file[0]);
+    this.find('.bootsy-upload-form').append(this.validation);
+  } else {
+    alert(Bootsy.translations[this.locale].error);
+  }
+  this.showRefreshButton();
+};
 
 // Set image gallery
 Bootsy.Area.prototype.setImageGallery = function() {
@@ -114,7 +131,9 @@ Bootsy.Area.prototype.setImageGallery = function() {
     },
     dataType: 'json',
     success: function(data) {
+      this.hideRefreshButton();
       this.hideGalleryLoadingAnimation();
+      this.find('.bootsy-gallery .bootsy-image').remove();
 
       $.each(data.images, function(index, value) {
         this.addImage(value);
@@ -128,11 +147,7 @@ Bootsy.Area.prototype.setImageGallery = function() {
 
       this.modal.data('gallery-loaded', true);
     }.bind(this),
-    error: function() {
-      alert(Bootsy.translations[this.locale].error);
-
-      this.showRefreshButton();
-    }.bind(this)
+    error: this.imageUploadFailed.bind(this)
   });
 };
 
@@ -152,7 +167,6 @@ Bootsy.Area.prototype.deleteImage = function (id) {
   }.bind(this));
 };
 
-
 // Add image to gallery
 Bootsy.Area.prototype.addImage = function(html) {
   this.hideEmptyAlert();
@@ -262,6 +276,8 @@ Bootsy.Area.prototype.init = function() {
         this.deleteImage(data.id);
       }.bind(this));
 
+      this.modal.on('ajax:error', '.bootsy-upload-form', this.imageUploadFailed.bind(this));
+
       this.modal.on('ajax:success', '.bootsy-upload-form', function(evt, data) {
         this.setImageGalleryId(data.gallery_id);
         this.addImage(data.image);

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

@@ -27,10 +27,12 @@ Bootsy.init = function() {
 
 /* Initialize Bootsy on document load */
 $(function() {
-  Bootsy.init();
+  $(window).load(function() {
+    Bootsy.init();
 
-  /* Reload Bootsy on page load when using Turbolinks. */
-  if (window.Turbolinks) {
-    $(document).on('page:load', Bootsy.init);
-  }
+    /* Reload Bootsy on page load when using Turbolinks. */
+    if (window.Turbolinks) {
+      $(document).on('page:load', Bootsy.init);
+    }
+  });
 });

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

@@ -0,0 +1,29 @@
+/*
+  Bootsy makes use of Function.prototype.bind, which is not supported by some older browsers.
+  Source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind
+*/
+
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function(oThis) {
+    if (typeof this !== 'function') {
+      // closest thing possible to the ECMAScript 5
+      // internal IsCallable function
+      throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+    }
+
+    var aArgs   = Array.prototype.slice.call(arguments, 1),
+        fToBind = this,
+        fNOP    = function() {},
+        fBound  = function() {
+          return fToBind.apply(this instanceof fNOP && oThis
+                 ? this
+                 : oThis,
+                 aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}

data/app/assets/stylesheets/bootsy.css

@@ -314,6 +314,10 @@ textarea.bootsy:required:invalid {
   padding-right: 5px;
 }
 
+.bootsy-upload-spacer {
+  padding: 0 10px 0 10px;
+}
+
 .bootsy-gallery-loader {
   display: block;
   margin: 0 auto;

data/app/controllers/bootsy/application_controller.rb

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

data/app/controllers/bootsy/images_controller.rb

@@ -2,8 +2,9 @@ require_dependency 'bootsy/application_controller'
 
 module Bootsy
   class ImagesController < Bootsy::ApplicationController
+    before_action :set_gallery, only: [:index, :create]
+
     def index
-      @gallery = find_gallery
       @images = @gallery.images
 
       respond_to do |format|
@@ -19,7 +20,6 @@ module Bootsy
     end
 
     def create
-      @gallery = find_gallery
       @gallery.save!
       @image = @gallery.images.new(image_params)
 
@@ -41,8 +41,8 @@ module Bootsy
 
     private
 
-    def find_gallery
-      ImageGallery.find(params[:image_gallery_id])
+    def set_gallery
+      @gallery = ImageGallery.find(params[:image_gallery_id])
     end
 
     # Private: Returns the String markup to render
@@ -72,7 +72,7 @@ module Bootsy
     end
 
     def image_params
-      params.require(:image).permit(:image_file)
+      params.require(:image).permit(:image_file, :remote_image_file_url)
     end
 
     def create_and_respond

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

@@ -4,5 +4,14 @@
 
   <%= image_tag 'bootsy/upload-loader.gif', class: 'bootsy-upload-loader' %>
 
+  <div class="input-group">
+    <%= f.url_field :remote_image_file_url, class: 'form-control', placeholder: t('bootsy.action.enter_image_url') %>
+    <span class="input-group-btn">
+      <%= f.submit t('bootsy.action.submit_upload'), class: 'btn btn-default' %>
+    </span>
+  </div>
+
+  <span class="bootsy-upload-spacer"><%= t('bootsy.action.or') %></span>
+
   <%= f.file_field :image_file, title: t('bootsy.action.upload') %>
 <% end %>

data/config/locales/bootsy.en.yml

@@ -5,7 +5,10 @@ en:
       destroy: Delete
       close: Close
       load: Load
+      or: or
       upload: Upload New Image
+      submit_upload: Go
+      enter_image_url: Enter a URL from the web...
     image_gallery: Image Gallery
     image:
       s: Image

data/config/locales/bootsy.pt-BR.yml

@@ -5,7 +5,10 @@ pt-BR:
       destroy: Apagar
       close: Fechar
       load: Carregar
+      or: ou
       upload: Nova imagem
+      submit_upload: Ir
+      enter_image_url: Digite uma URL da web...
     image_gallery: Galeria de Imagens
     image:
       s: Imagem

data/config/routes.rb

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

data/lib/bootsy.rb

@@ -56,6 +56,10 @@ module Bootsy
   mattr_accessor :store_dir
   @@store_dir = 'uploads'
 
+  # Specify which controller to inherit from
+  mattr_accessor :base_controller
+  @@base_controller = ActionController::Base
+
   # Default way to setup Bootsy. Run rails generate bootsy:install
   # to create a fresh initializer with all configuration values.
   def self.setup

data/lib/bootsy/container.rb

@@ -11,43 +11,41 @@ module Bootsy
     extend ActiveSupport::Concern
 
     included do
-      class_eval do
-        has_one :bootsy_image_gallery,
-                class_name: 'Bootsy::ImageGallery',
-                as: :bootsy_resource,
-                dependent: :destroy
+      has_one :bootsy_image_gallery,
+              class_name: 'Bootsy::ImageGallery',
+              as: :bootsy_resource,
+              dependent: :destroy
+    end
 
-        # Public: Get the `id` attribute of the image gallery.
-        #
-        # Returns an Integer id or nil when there is
-        # not an image gallery.
-        def bootsy_image_gallery_id
-          bootsy_image_gallery.try(:id)
-        end
+    # Public: Get the `id` attribute of the image gallery.
+    #
+    # Returns an Integer id or nil when there is
+    # not an image gallery.
+    def bootsy_image_gallery_id
+      bootsy_image_gallery.try(:id)
+    end
 
-        # Public: Set the image gallery `id` and save
-        # the association between models.
-        #
-        # Examples
-        #
-        #   container.id
-        #   # => 34
-        #   gallery.id
-        #   # => 12
-        #   container.bootsy_image_gallery_id = gallery.id
-        #   container.image_gallery_id
-        #   # => 12
-        #   gallery.bootsy_resource.id
-        #   # => 34
-        def bootsy_image_gallery_id=(value)
-          if bootsy_image_gallery.nil? && value.present?
-            self.bootsy_image_gallery = Bootsy::ImageGallery.find(value)
-            bootsy_image_gallery.bootsy_resource = self
-            bootsy_image_gallery.save
-          else
-            value
-          end
-        end
+    # Public: Set the image gallery `id` and save
+    # the association between models.
+    #
+    # Examples
+    #
+    #   container.id
+    #   # => 34
+    #   gallery.id
+    #   # => 12
+    #   container.bootsy_image_gallery_id = gallery.id
+    #   container.image_gallery_id
+    #   # => 12
+    #   gallery.bootsy_resource.id
+    #   # => 34
+    def bootsy_image_gallery_id=(value)
+      if bootsy_image_gallery.nil? && value.present?
+        self.bootsy_image_gallery = Bootsy::ImageGallery.find(value)
+        bootsy_image_gallery.bootsy_resource = self
+        bootsy_image_gallery.save
+      else
+        value
       end
     end
   end

data/lib/bootsy/version.rb

@@ -1,4 +1,4 @@
 # Public: The gem version
 module Bootsy
-  VERSION = '2.0.13'
+  VERSION = '2.1.0'
 end

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

@@ -61,4 +61,9 @@ Bootsy.setup do |config|
   # Store directory (inside 'public') for storage = :file
   #   BE CAREFUL! Changing this may break previously uploaded file paths!
   # config.store_dir = 'uploads'
+  #
+  #
+  # Specify the controller to inherit from. Using ApplicationController
+  # allows you to perform authentication from within your app.
+  # config.base_controller = ActionController::Base
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -72,6 +72,7 @@ files:
 - 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/polyfill.js
 - app/assets/javascripts/bootsy/translations.js
 - app/assets/javascripts/bootsy/wysihtml5.js
 - app/assets/stylesheets/bootsy.css