bootsy 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd19bd8302ef3b07ae64fe9346417c910ac2de0
-  data.tar.gz: 2fde333b4b996b95c492ad1f95f782bcba6969c7
+  metadata.gz: f3e427acd6cd736c47f74ecd5b6ab500d65b392a
+  data.tar.gz: 261b8bba75df325c62140a95c3658c4fce149d86
 SHA512:
-  metadata.gz: c1707b0e8a58328889b9de650eb50c5f7b87b7da6a4492e9ffc88a981a0d2f6e420218772f84ced5c1da3d69f9eb59f56e8d820bb88e0be9b4363f0c869abcbc
-  data.tar.gz: 25072bd9c85b63fc2e2c9880dd0de29a1095ea178ebcd38c365ec332615ada2b2afca7711a84f3eb4510757772b1c39688bd27889e9ab668e25c2b8b5785c87c
+  metadata.gz: 067d908ddc81707cd99d661126bdae0daabf71bd9fd5efb956c381c3ab49328f38121d008a605460dc0a42b220898e267bb1520e3fb2b8e1f47038ad1c608db5
+  data.tar.gz: 1dc13c44973b4796563ec38b6d9806fd74288e7fcd3ed837cf9b8d0eb1025369451d5133279b504820295d20d54fbd9f7fb4523c99b45af8669988a446c0ae38

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Volmer Soares
+Copyright 2012-2014 Volmer Soares
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -8,12 +8,15 @@
 
 *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).
 
-![image](https://f.cloud.github.com/assets/301187/1365250/e1b7ba80-3854-11e3-9bfe-8bd1e090aca8.png)
+### Live demo
+
+* [bootsy-demo.herokuapp.com](http://bootsy-demo.herokuapp.com/)
+[![image](https://f.cloud.github.com/assets/301187/1365250/e1b7ba80-3854-11e3-9bfe-8bd1e090aca8.png)](http://bootsy-demo.herokuapp.com/)
 
 
 ## Requirements
 
-* Ruby `2.0` or `1.9.3`;
+* Ruby `2` or `1.9.3`;
 * ImageMagick or GraphicsMagick (for MiniMagick);
 * Rails `4.0`;
 * [Bootstrap `3`](http://getbootstrap.com/) properly added to your application.
@@ -149,4 +152,4 @@ for it as well. Just follow [this example](https://github.com/volmer/bootsy/tree
 
 ## License
 
-MIT License. Copyright 2013 Volmer Soares
+MIT License. Copyright 2012-2014 Volmer Soares

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

@@ -1,3 +1,5 @@
+/* global Bootsy */
+
 window.Bootsy = window.Bootsy || {};
 
 Bootsy.Area = function($el) {
@@ -14,12 +16,30 @@ Bootsy.Area = function($el) {
     uploader: $el.data('bootsy-uploader'),
   };
 
-  if ($el.data('bootsy-font-styles') === false) this.options['font-styles'] = false;
-  if ($el.data('bootsy-emphasis') === false) this.options.emphasis = false;
-  if ($el.data('bootsy-lists') === false) this.options.lists = false;
-  if ($el.data('bootsy-html') === true) this.options.html = true;
-  if ($el.data('bootsy-link') === false) this.options.link = false;
-  if ($el.data('bootsy-color') === false) this.options.color = false;
+  // Set default values to editor options
+  if ($el.data('bootsy-font-styles') === false) {
+    this.options['font-styles'] = false;
+  }
+
+  if ($el.data('bootsy-emphasis') === false) {
+    this.options.emphasis = false;
+  }
+
+  if ($el.data('bootsy-lists') === false) {
+    this.options.lists = false;
+  }
+
+  if ($el.data('bootsy-html') === true) {
+    this.options.html = true;
+  }
+
+  if ($el.data('bootsy-link') === false) {
+    this.options.link = false;
+  }
+
+  if ($el.data('bootsy-color') === false) {
+    this.options.color = false;
+  }
 
   // Delegate find to the modal
   this.find = this.modal.find.bind(this.modal);
@@ -66,8 +86,6 @@ Bootsy.Area.prototype.hideRefreshButton = function() {
 
 // Set upload form
 Bootsy.Area.prototype.setUploadForm = function(html) {
-  var form;
-
   this.find('.modal-footer').html(html);
 
   this.hideUploadLoadingAnimation();
@@ -103,7 +121,7 @@ Bootsy.Area.prototype.setImageGallery = function() {
         this.addImage(value);
       }.bind(this));
 
-      if (data.images.length == 0) {
+      if (data.images.length === 0) {
         this.showEmptyAlert();
       }
 
@@ -111,7 +129,7 @@ Bootsy.Area.prototype.setImageGallery = function() {
 
       this.modal.data('gallery-loaded', true);
     }.bind(this),
-    error: function(e) {
+    error: function() {
       alert(Bootsy.translations[this.locale].error);
 
       this.showRefreshButton();
@@ -129,7 +147,7 @@ Bootsy.Area.prototype.deleteImage = function (id) {
     image.remove();
 
     // Put message back if 0 images
-    if (this.find('.bootsy-image').length == 0 ) {
+    if (this.find('.bootsy-image').length === 0 ) {
       this.showEmptyAlert();
     }
   }.bind(this));
@@ -200,6 +218,8 @@ Bootsy.Area.prototype.init = function() {
         var img, imageObject;
         var imagePrefix = '/' + $(this).attr('data-image-size') + '_';
 
+        e.preventDefault();
+
         if ($(this).data('image-size') === 'original') {
           imagePrefix = '/';
         }
@@ -257,7 +277,7 @@ Bootsy.Area.prototype.init = function() {
       window.onbeforeunload = this.unsavedChangesAlert.bind(this);
     }
 
-    this.$el.closest('form').submit(function(e) {
+    this.$el.closest('form').submit(function() {
       this.unsavedChanges = false;
 
       return true;

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

@@ -1,5 +1,8 @@
+/* global Bootsy */
 window.Bootsy = window.Bootsy || {};
 
+// Public: Intialize Bootsy editors in all visible `textarea`
+//         elements that has the `bootsy_text_area` class.
 Bootsy.init = function() {
   Bootsy.areas = {};
 
@@ -17,4 +20,12 @@ Bootsy.init = function() {
   });
 };
 
-$(Bootsy.init);
+/* Initialize Bootsy on document load */
+$(function() {
+  Bootsy.init();
+
+  /* Reload Bootsy on page load when using Turbolinks. */
+  if (window.Turbolinks) {
+    document.addEventListener('page:load', Bootsy.init);
+  }
+});

data/app/controllers/bootsy/images_controller.rb

@@ -66,10 +66,9 @@ module Bootsy
     end
 
     private
+
     def find_gallery
-      ImageGallery.find params[:image_gallery_id]
-    rescue
-      ImageGallery.new
+      ImageGallery.find(params[:image_gallery_id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.

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

@@ -1,4 +1,4 @@
-<div class="bootsy-image dropdown col-md-2" data-id="<%= image.id %>">
+<div class="bootsy-image dropdown col-sm-2" data-id="<%= image.id %>">
   <%= link_to image_tag(image.image_file.thumb.url), '#', class: 'thumbnail',
     data: { toggle: 'dropdown' } %>
 

data/config/locales/pt-BR.yml

@@ -5,6 +5,7 @@ pt-BR:
       destroy: Apagar
       close: Fechar
       load: Carregar
+      upload: Nova imagem
     image_gallery: Galeria de Imagens
     image:
       s: Imagem
@@ -20,4 +21,7 @@ pt-BR:
       position:
         left: Esquerda
         right: Direita
-        inline: Mesma linha
+        inline: Mesma linha
+    no_images_uploaded: Não existem imagens salvas.
+    js:
+      alert_unsaved: As suas modificações ainda não foram gravadas.

data/lib/bootsy/container.rb

@@ -19,7 +19,7 @@ module Bootsy
 
         def bootsy_image_gallery_id=(value)
           if self.bootsy_image_gallery.nil? && !value.blank?
-            ig = Bootsy::ImageGallery.find value
+            ig = Bootsy::ImageGallery.find(value)
             self.bootsy_image_gallery = ig
             ig.bootsy_resource = self
             ig.save

data/lib/bootsy/form_helper.rb

@@ -1,21 +1,16 @@
 module Bootsy
   module FormHelper
     def bootsy_area(object_name, method, options = {})
-      object    = options[:object]
-      container = options.delete(:container)
+      container = options[:container] || options[:object]
 
-      bootsy_options = Bootsy.editor_options.merge(options.delete(:editor_options) || {})
-      bootsy_options[:uploader] = enable_uploader?(object, options.delete(:uploader), container)
+      output = self.text_area(object_name, method, text_area_options(options))
 
-      options[:data]  = data_options(options, bootsy_options)
-      options[:class] = class_attr(options)
+      if output.present? && enable_uploader?(options)
+        container.bootsy_image_gallery_id ||= Bootsy::ImageGallery.create!.id
 
-      output = self.text_area(object_name, method, options)
+        output += self.render('bootsy/images/modal', container: container)
 
-      if bootsy_options[:uploader]
-        output += self.render 'bootsy/images/modal', { container: container || object }
-
-        if container.blank? || (container == object)
+        if container.new_record?
           output += self.hidden_field(object_name, :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id')
         end
       end
@@ -25,19 +20,19 @@ module Bootsy
 
     private
 
-    def enable_uploader?(object, uploader, container)
-      if uploader == false
+    def enable_uploader?(options)
+      if options[:uploader] == false
         false
-      elsif container.is_a?(Container)
+      elsif options[:container].is_a?(Container)
         true
-      elsif container.blank? && object.is_a?(Container)
+      elsif options[:container].blank? && options[:object].is_a?(Container)
         true
       else
         false
       end
     end
 
-    def class_attr(options)
+    def tag_class(options)
       classes = if options[:class].blank?
         []
       elsif options[:class].kind_of?(Array)
@@ -49,8 +44,25 @@ module Bootsy
       classes << 'bootsy_text_area'
     end
 
-    def data_options(options, bootsy_options)
-      (options[:data] || {}).merge Hash[ bootsy_options.map { |k,v| ["bootsy-#{k}", v] } ]
+    def data_options(options)
+      (options[:data] || {}).merge Hash[ bootsy_options(options).map { |k,v| ["bootsy-#{k}", v] } ]
+    end
+
+    def bootsy_options(options)
+      Bootsy.editor_options.
+        merge(options[:editor_options] || {}).
+        merge(uploader: enable_uploader?(options))
+    end
+
+    def text_area_options(options)
+      options.except(
+        :container,
+        :uploader,
+        :editor_options
+      ).merge(
+        data: data_options(options),
+        class: tag_class(options)
+      )
     end
   end
 end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/lib/generators/bootsy/install_generator.rb

@@ -4,37 +4,47 @@ module Bootsy
       source_root __FILE__
 
       def add_routes
-        route "mount Bootsy::Engine => '/bootsy', as: 'bootsy'"
+        route("mount Bootsy::Engine => '/bootsy', as: 'bootsy'")
       end
 
       def copy_locale
-        copy_file "../../../../config/locales/en.yml", "config/locales/bootsy.en.yml"
+        copy_file('../../../../config/locales/en.yml', 'config/locales/bootsy.en.yml')
       end
 
       def add_assets
-
-        [{original: 'app/assets/javascripts/application.js',
-          skip_if: 'require bootsy',
-          content: "\n//= require bootsy",
-          position: {after: '//= require jquery_ujs'}},
-         {original: 'app/assets/stylesheets/application.css',
-          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
+        [
+          {
+            original: 'app/assets/javascripts/application.js',
+            skip_if: 'require bootsy',
+            content: "\n//= require bootsy",
+            position: {
+              after: '//= require jquery_ujs'
+            }
+          },
+          {
+            original: 'app/assets/stylesheets/application.css',
+            skip_if: 'require bootsy',
+            content: "\n *= require bootsy",
+            position: {
+              after: '*= require_self'
+            }
+          }
+        ].each do |params|
+          if File.exists?(params[:original])
+            if File.binread(params[:original]).include?(params[:skip_if])
+              say_status('skipped', "insert into #{params[:original]}", :yellow)
+            else
+              insert_into_file(params[:original], params[:content], params[:position])
+            end
           else
-            insert_into_file params[:original], params[:content], params[:position]
+            say_status('not found', "#{params[:original]} not found. You must manually require Bootsy in your assets pipeline.", :red)
           end
         end
-
       end
 
       def copy_config
-        template '../templates/bootsy.rb', 'config/initializers/bootsy.rb'
+        template('../templates/bootsy.rb', 'config/initializers/bootsy.rb')
       end
-
     end
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: remotipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 description: A beautiful WYSIWYG editor with image uploads for Rails.
@@ -59,8 +59,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/images/bootsy/gallery-loader.gif
 - app/assets/images/bootsy/upload-loader.gif
+- app/assets/javascripts/bootsy.js
 - app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
 - app/assets/javascripts/bootsy/bootstrap.file-input.js
 - app/assets/javascripts/bootsy/bootsy.js
@@ -70,11 +74,10 @@ files:
 - app/assets/javascripts/bootsy/locales/bootsy.pt-BR.js
 - app/assets/javascripts/bootsy/translations.js
 - app/assets/javascripts/bootsy/wysihtml5.js
-- app/assets/javascripts/bootsy.js
+- app/assets/stylesheets/bootsy.css
 - 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
 - app/controllers/bootsy/application_controller.rb
 - app/controllers/bootsy/images_controller.rb
 - app/helpers/bootsy/application_helper.rb
@@ -88,6 +91,7 @@ files:
 - config/routes.rb
 - db/migrate/20120624171333_create_bootsy_images.rb
 - db/migrate/20120628124845_create_bootsy_image_galleries.rb
+- lib/bootsy.rb
 - lib/bootsy/activerecord/image.rb
 - lib/bootsy/activerecord/image_gallery.rb
 - lib/bootsy/container.rb
@@ -97,17 +101,14 @@ files:
 - lib/bootsy/form_helper.rb
 - lib/bootsy/simple_form/bootsy_input.rb
 - lib/bootsy/version.rb
-- lib/bootsy.rb
+- lib/generators/bootsy/USAGE
 - lib/generators/bootsy/install_generator.rb
 - lib/generators/bootsy/templates/bootsy.rb
-- lib/generators/bootsy/USAGE
 - lib/tasks/bootsy_tasks.rake
 - lib/tasks/cucumber.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: http://github.com/volmer/bootsy
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -115,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A beautiful WYSIWYG editor with image uploads for Rails.