bootsy 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1957bbe60a7a4bfadafed8047f4658eb39ee93
-  data.tar.gz: ac5b53a2c8e6c03bf9566e3ccef91c0d5ab87c70
+  metadata.gz: 27b663d973185f6a2ea2f0b028af0f89438e115f
+  data.tar.gz: 32029064e1888368223bf99e8e428089765773a4
 SHA512:
-  metadata.gz: f4506e96075bc21d611c1c0bf834613aecff4be208b595fe4a4173f96d89e4b6d490cf681ac227df589001146936c0dd328b45969840d95d60d7f67ff2c8a246
-  data.tar.gz: 0ccbba8b3fe80b608b51d00e346c921ff7d0c827cd429187e2521419e04511ab3fbc7b2f357b33ff30067f05a67b957bd458144b1e5eb92a2cecbb2f07ba4694
+  metadata.gz: a4f9366cf44693f59579830135117516db34a783b0c2da2494ad264ab8ec2e6e752db3632f758069de48faec69a5a6de19f2a8886437e3dad1a6f557d51e2a67
+  data.tar.gz: 53e3dafe4aa45a23627db6a9297aeb89efb515c704deac9d4f257a2aec6934cc6ad13d627d032fb260d0da83eb5366ff6837fdf7564a31789753fd1cf0b84909

data/README.md

@@ -4,7 +4,6 @@
 [![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 editor for Rails based on
 [Bootstrap-wysihtml5](https://github.com/jhollingworth/bootstrap-wysihtml5) with image uploads using
@@ -19,8 +18,8 @@
 ## Requirements
 
 * ImageMagick or GraphicsMagick (for MiniMagick);
-* Rails `4`;
-* [Bootstrap `3`](http://getbootstrap.com/) fully installed in your app.
+* Rails >= 4;
+* [Bootstrap 3](http://getbootstrap.com/) fully installed in your app.
 
 
 ## Installation
@@ -35,16 +34,21 @@
   bundle install
   ```
 
-3. Run the install generator:
-  ```console
-  bundle exec rails generate bootsy:install
+3. Require Bootsy in the asset pipeline:
+
+  In your `app/assets/javascripts/application.js`, put this **after**
+  requiring jQuery and Bootstrap:
+
+  ```javascript
+  //= require bootsy
   ```
-  It will include the javascripts and stylesheets in the assets pipeline,
-  create the `bootsy.rb` initializer and add a copy of the english translations.
 
-  **Note:** If your project uses SASS or LESS and `application.css` does not exist,
-  you will be required to require bootsy manually using `*= require bootsy` or if you prefer
-  to import assets yourself `@import "bootsy";`
+  In your `app/assets/stylesheets/application.css`, put this line **after**
+  requiring Bootstrap:
+
+  ```css
+  *= require bootsy
+  ```
 
 4. Add and run migrations:
   ```console
@@ -136,17 +140,16 @@ images in the text area using an external image URL.
 ## Configuration
 
 You can set the default editor options, image sizes available (small, medium,
-large and/or its original), dimensions and more. Take a look at Bootsy's initalizer
-file `/config/initializers/bootsy.rb` in your app and feel free to uncomment and change
-the options as you like.
+large and/or its original), dimensions and more. Create a copy of [Bootsy's initalizer
+file](https://github.com/volmer/bootsy/tree/master/config/initializers/bootsy.rb)
+in your `config/initializers` and feel free to uncomment and change the options
+as you like.
 
 
 ## I18n
 
-Bootsy defines some I18n keys. English translations are added by default to your
-`config/locales` directory as `bootsy.en.yml`. You can use it as a template
-to translate Bootsy to your language.
-[Here are some examples](https://github.com/volmer/bootsy/tree/master/config/locales).
+You can translate Bootsy to your own language. Simply create a locale file for
+it in your `config/locales` directory similar to [Bootsy's master English file](https://github.com/volmer/bootsy/tree/master/config/locales/bootsy.en.yml).
 
 You also need to translate Bootsy on the JavaScript side. Just follow
 [this example](https://github.com/volmer/bootsy/blob/master/app/assets/javascripts/bootsy/locales/en.js).
@@ -156,4 +159,4 @@ You can set the locale directly by setting a `data-bootsy-locale` attribute on y
 
 ## License
 
-MIT License. Copyright 2012-2015 Volmer Soares
+MIT License. Copyright 2012-2016 Volmer Soares

data/Rakefile

@@ -1,35 +1,10 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Bootsy'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-require 'coveralls/rake/task'
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['app/**/*.rb', 'lib/**/*.rb']
 end
-Coveralls::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:rubocop, :spec, 'coveralls:push']
+task default: [:rubocop, :spec]

data/app/assets/javascripts/bootsy.js

@@ -1,4 +1,3 @@
-//= require jquery.remotipart
 //= require bootsy/vendor/polyfill
 //= require bootsy/vendor/wysihtml5
 //= require bootsy/vendor/bootstrap-wysihtml5

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

@@ -42,14 +42,47 @@ Bootsy.Modal = function(area) {
     this.deleteImage(data.id);
   }.bind(this));
 
-  this.$el.on('ajax:error', '.bootsy-upload-form', this.imageUploadFailed.bind(this));
-
   this.$el.on('click', 'a[href="#refresh-gallery"]', this.requestImageGallery.bind(this));
 
-  this.$el.on('ajax:success', '.bootsy-upload-form', function(_e, data) {
-    this.area.setImageGalleryId(data.gallery_id);
-    this.addImage(data.image);
-    this.setUploadForm(data.form);
+  this.$el.on('submit', '.bootsy-upload-form', function(event, xhr, settings) {
+    var fileSelect = event.target.querySelector('input[type="file"]');
+    var formData = new FormData();
+    var file = fileSelect.files[0];
+    var fileURLInputName = 'image[remote_image_file_url]';
+    var fileURLInput = event.target.querySelector(
+      'input[name="' + fileURLInputName + '"]');
+    var fileURL;
+
+    event.preventDefault();
+
+    formData.append('authenticity_token',
+      event.target.querySelector('input[name="authenticity_token"]').value);
+
+    if (file) {
+      formData.append('image[image_file]', file, file.name);
+    }
+
+    if (fileURLInput) {
+      fileURL = fileURLInput.value;
+    } else {
+      fileURL = '';
+    }
+
+    formData.append(fileURLInputName, fileURL);
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', event.target.action, true);
+    xhr.onload = function () {
+      var data = JSON.parse(xhr.response);
+      if (xhr.status === 200) {
+        this.area.setImageGalleryId(data.gallery_id);
+        this.addImage(data.image);
+        this.setUploadForm(data.form);
+      } else {
+        this.imageUploadFailed(xhr, data);
+      }
+    }.bind(this);
+    xhr.send(formData);
   }.bind(this));
 
   this.$el.modal({ show: false });
@@ -122,9 +155,7 @@ Bootsy.Modal.prototype.setUploadForm = function(html) {
 };
 
 // The image upload failed
-Bootsy.Modal.prototype.imageUploadFailed = function(_e, xhr, _status, error) {
-  var invalidErrors = xhr.responseJSON;
-
+Bootsy.Modal.prototype.imageUploadFailed = function(xhr, invalidErrors) {
   if (Number(xhr.status) === 422 && invalidErrors.image_file) {
     this.hideUploadLoadingAnimation();
 

data/app/controllers/bootsy/images_controller.rb

@@ -54,7 +54,8 @@ module Bootsy
       render_to_string(
         file: 'bootsy/images/_image',
         formats: [:html],
-        locals: { image: image }
+        locals: { image: image },
+        layout: false
       )
     end
 
@@ -67,7 +68,8 @@ module Bootsy
       render_to_string(
         file: 'bootsy/images/_new',
         formats: [:html],
-        locals: { gallery: gallery, image: gallery.images.new }
+        locals: { gallery: gallery, image: gallery.images.new },
+        layout: false
       )
     end
 

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

@@ -1,5 +1,5 @@
-<%= form_for([bootsy, resource_or_nil(gallery), image], remote: true,
-  html: { multipart: true, class: 'bootsy-upload-form form-inline' }, data: { type: 'json' }) do |f| %>
+<%= form_for([bootsy, resource_or_nil(gallery), image],
+  html: { multipart: true, class: 'bootsy-upload-form form-inline' }, format: 'json') do |f| %>
   <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
 
   <%= render 'bootsy/images/loader', image_class: 'bootsy-upload-loader' %>
@@ -13,5 +13,5 @@
 
   <span class="bootsy-upload-spacer"><%= t('bootsy.action.or') %></span>
 
-  <%= f.file_field :image_file, title: t('bootsy.action.upload') %>
+  <%= f.file_field :image_file, title: t('bootsy.action.upload'), accept: 'image/*' %>
 <% end %>

data/lib/bootsy.rb

@@ -1,5 +1,4 @@
 require 'carrierwave'
-require 'remotipart'
 require 'bootsy/engine'
 require 'bootsy/container'
 require 'bootsy/form_helper'

data/lib/bootsy/form_helper.rb

@@ -71,8 +71,8 @@ module Bootsy
     end
 
     def bootsy_options(options)
-      Bootsy.editor_options.merge(options[:editor_options] || {}).merge(
-        uploader: enable_uploader?(options))
+      Bootsy.editor_options.merge(options[:editor_options] || {})
+            .merge(uploader: enable_uploader?(options))
     end
 
     def text_area_options(options)

data/lib/bootsy/version.rb

@@ -1,4 +1,4 @@
 # Public: The gem version
 module Bootsy
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -16,45 +16,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: remotipart
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.11'
 description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
-- volmer@radicaos.com
+- rubygems@radicaos.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,6 +69,7 @@ files:
 - app/views/bootsy/images/_loader.html.erb
 - app/views/bootsy/images/_modal.html.erb
 - app/views/bootsy/images/_new.html.erb
+- config/initializers/bootsy.rb
 - config/locales/bootsy.en.yml
 - config/locales/bootsy.pt-BR.yml
 - config/routes.rb
@@ -98,10 +85,6 @@ files:
 - lib/bootsy/form_helper.rb
 - lib/bootsy/simple_form/bootsy_input.rb
 - lib/bootsy/version.rb
-- lib/generators/bootsy/USAGE
-- lib/generators/bootsy/install_generator.rb
-- lib/generators/bootsy/templates/bootsy.rb
-- lib/tasks/bootsy_tasks.rake
 homepage: http://github.com/volmer/bootsy
 licenses:
 - MIT
@@ -122,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A beautiful WYSIWYG editor with image uploads for Rails.

data/lib/generators/bootsy/USAGE

@@ -1,12 +0,0 @@
-Description:
-    Adds Bootsy routes, locale and assets to your application.
-
-Example:
-    rails generate bootsy:install
-
-    This will create:
-      route  mount Bootsy::Engine => '/bootsy', as: 'bootsy'
-      create  config/locales/bootsy.en.yml
-      insert  app/assets/javascripts/application.js
-      insert  app/assets/stylesheets/application.css
-

data/lib/generators/bootsy/install_generator.rb

@@ -1,53 +0,0 @@
-module Bootsy
-  module Generators
-    # Public: A Rails Generator to copy translations, assets and routes to
-    # the host app.
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
-
-      def add_routes
-        route "mount Bootsy::Engine => '/bootsy', as: 'bootsy'"
-      end
-
-      def copy_locale
-        copy_file '../../../../config/locales/bootsy.en.yml',
-                  'config/locales/bootsy.en.yml'
-      end
-
-      def add_javascript
-        require_asset(
-          'app/assets/javascripts/application.js',
-          "\n//= require bootsy",
-          '//= require jquery_ujs'
-        )
-      end
-
-      def add_stylesheet
-        require_asset(
-          'app/assets/stylesheets/application.css',
-          "\n *= require bootsy",
-          '*= require_self'
-        )
-      end
-
-      def copy_config
-        template 'bootsy.rb', 'config/initializers/bootsy.rb'
-      end
-
-      private
-
-      def require_asset(destination, content, after_line)
-        if File.exist?(destination)
-          if File.binread(destination).include?(content)
-            say_status('skipped', "insert into #{destination}", :yellow)
-          else
-            insert_into_file(destination, content, after: after_line)
-          end
-        else
-          say_status('not found', "#{destination} not found. You must
-            manually require Bootsy in your assets pipeline.", :red)
-        end
-      end
-    end
-  end
-end

data/lib/tasks/bootsy_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :bootsy do
-#   # Task goes here
-# end