bootsy 2.0.11 → 2.0.12

data/app/controllers/bootsy/images_controller.rb

@@ -11,7 +11,7 @@ module Bootsy
 
         format.json do
           render json: {
-            images: @images.map {|image| image_markup(image) },
+            images: @images.map { |image| image_markup(image) },
             form: new_image_markup(@gallery)
           }
         end
@@ -20,25 +20,10 @@ module Bootsy
 
     def create
       @gallery = find_gallery
-      @gallery.save! unless @gallery.persisted?
+      @gallery.save!
       @image = @gallery.images.new(image_params)
 
-      respond_to do |format|
-        if @image.save
-          format.json {
-            render json: {
-              image: image_markup(@image),
-              form: new_image_markup(@gallery),
-              gallery_id: @gallery.id
-            }
-          }
-        else
-          format.json {
-            render json: @image.errors,
-            status: :unprocessable_entity
-          }
-        end
-      end
+      create_and_respond
     end
 
     def destroy
@@ -46,9 +31,9 @@ module Bootsy
       @image.destroy
 
       respond_to do |format|
-        format.json {
+        format.json do
           render json: { id: params[:id] }
-        }
+        end
 
         format.html { redirect_to images_url }
       end
@@ -86,9 +71,26 @@ module Bootsy
       )
     end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
     def image_params
       params.require(:image).permit(:image_file)
     end
+
+    def create_and_respond
+      respond_to do |format|
+        if @image.save
+          format.json do
+            render json: {
+              image: image_markup(@image),
+              form: new_image_markup(@gallery),
+              gallery_id: @gallery.id
+            }
+          end
+        else
+          format.json do
+            render json: @image.errors, status: :unprocessable_entity
+          end
+        end
+      end
+    end
   end
 end

data/app/helpers/bootsy/application_helper.rb

@@ -1,10 +1,12 @@
 module Bootsy
   module ApplicationHelper
     def refresh_btn
-      link_to t('bootsy.action.refresh'), '#refresh-gallery', class: 'btn btn-default btn-sm refresh-btn'
+      link_to t('bootsy.action.refresh'),
+              '#refresh-gallery',
+              class: 'btn btn-default btn-sm refresh-btn'
     end
 
-    def resource_or_nil resource
+    def resource_or_nil(resource)
       resource if resource.present? && resource.persisted?
     end
   end

data/app/uploaders/bootsy/image_uploader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Bootsy
   class ImageUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
@@ -9,19 +8,24 @@ module Bootsy
       "#{Bootsy.store_dir}/#{model.class.to_s.underscore}/#{model.id}"
     end
 
-    # Process files as they are uploaded:
     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

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

@@ -1,12 +1,14 @@
-<div class="modal fade bootsy-modal"  tabindex="-1"
-  role="dialog" aria-hidden="true" data-no-turbolink
+<div class="modal fade bootsy-modal"
+  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>
+        <button type="button" class="close" data-dismiss="modal">
+          <span aria-hidden="true">&times;</span>
+        </button>
 
-        <h3 class="modal-title"><%= t 'bootsy.image.p' %></h3>
+        <h4 class="modal-title"><%= t 'bootsy.image.p' %></h4>
       </div>
 
       <div class="modal-body">

data/lib/bootsy.rb

@@ -8,6 +8,7 @@ require 'bootsy/core_ext'
 
 autoload :BootsyInput, 'bootsy/simple_form/bootsy_input'
 
+# Public: Top Bootsy module
 module Bootsy
   ## CONFIGURATION OPTIONS
 
@@ -33,15 +34,15 @@ module Bootsy
 
   # Settings for small images
   mattr_accessor :small_image
-  @@small_image = {width: 160, height: 160}
+  @@small_image = { width: 160, height: 160 }
 
   # Settings for medium images
   mattr_accessor :medium_image
-  @@medium_image = {width: 360, height: 360}
+  @@medium_image = { width: 360, height: 360 }
 
   # Settings for large images
   mattr_accessor :large_image
-  @@large_image = {width: 760, height: 760}
+  @@large_image = { width: 760, height: 760 }
 
   # Settings for the original version of images
   mattr_accessor :original_image
@@ -55,9 +56,6 @@ module Bootsy
   mattr_accessor :store_dir
   @@store_dir = 'uploads'
 
-
-  ## SETUP
-
   # 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/activerecord/image_gallery.rb

@@ -13,8 +13,11 @@ module Bootsy
     belongs_to :bootsy_resource, polymorphic: true, autosave: false
     has_many :images, dependent: :destroy
 
-    scope :destroy_orphans, ->(time_limit) {
-      where('created_at < ? AND bootsy_resource_id IS NULL', time_limit).destroy_all
+    scope :destroy_orphans, lambda { |time_limit|
+      where(
+        'created_at < ? AND bootsy_resource_id IS NULL',
+        time_limit
+      ).destroy_all
     }
   end
 end

data/lib/bootsy/container.rb

@@ -13,16 +13,16 @@ module Bootsy
     included do
       class_eval do
         has_one :bootsy_image_gallery,
-          class_name: 'Bootsy::ImageGallery',
-          as: :bootsy_resource,
-          dependent: :destroy
+                class_name: 'Bootsy::ImageGallery',
+                as: :bootsy_resource,
+                dependent: :destroy
 
         # 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
-          self.bootsy_image_gallery.try(:id)
+          bootsy_image_gallery.try(:id)
         end
 
         # Public: Set the image gallery `id` and save
@@ -40,11 +40,12 @@ module Bootsy
         #   gallery.bootsy_resource.id
         #   # => 34
         def bootsy_image_gallery_id=(value)
-          if self.bootsy_image_gallery.nil? && !value.blank?
-            image_gallery                 = Bootsy::ImageGallery.find(value)
-            self.bootsy_image_gallery     = image_gallery
-            image_gallery.bootsy_resource = self
-            image_gallery.save
+          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/engine.rb

@@ -25,7 +25,9 @@ module Bootsy
       # Require Active Record models. Other ORMs must
       # include their own Bootsy models.
       if orm == :activerecord
-        Dir[File.expand_path('../activerecord/*.rb', __FILE__)].each {|f| require f }
+        Dir[File.expand_path('../activerecord/*.rb', __FILE__)].each do |f|
+          require f
+        end
       end
     end
   end

data/lib/bootsy/form_helper.rb

@@ -12,30 +12,35 @@ module Bootsy
     #
     # options     - The Hash of options used to enable/disable features of
     #               the editor (default: {}):
-    #               :container      - The `Bootsy::Container` instance model that
-    #                                 will be referenced by the editor's image
-    #                                 gallery. Defaults to the object assigned to
-    #                                 the template, if it is a `Container`.
-    #               :uploader       - The Boolean value used to enable/disable the
-    #                                 image upload feature. Default: true, if a
-    #                                 `Container` is found. false otherwise.
-    #               :editor_options - The Hash of options with Boolean values used
-    #                                 to enable/disable features of the editor.
-    #                                 Available options are described in the Bootsy
-    #                                 initializer file (which is the default for
-    #                                 this argument).
+    #               :container      - The `Bootsy::Container` instance model
+    #                                 that will be referenced by the editor's
+    #                                 image gallery. Defaults to the object
+    #                                 assigned to the template, if it is a
+    #                                 `Container`.
+    #               :uploader       - The Boolean value used to enable/disable
+    #                                 the image upload feature. Default: true,
+    #                                 if a`Container` is found, false otherwise.
+    #               :editor_options - The Hash of options with Boolean values
+    #                                 usedto enable/disable features of the
+    #                                 editor. Available options are described ib
+    #                                 the Bootsyinitializer file (which is the
+    #                                 default for this argument).
     def bootsy_area(object_name, method, options = {})
       container = options[:container] || options[:object]
 
-      output = self.text_area(object_name, method, text_area_options(options))
+      output = text_area(object_name, method, text_area_options(options))
 
       if output.present? && enable_uploader?(options)
         container.bootsy_image_gallery_id ||= Bootsy::ImageGallery.create!.id
 
-        output += self.render('bootsy/images/modal', container: container)
+        output += render('bootsy/images/modal', container: container)
 
         if container.new_record?
-          output += self.hidden_field(object_name, :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id')
+          output += hidden_field(
+            object_name,
+            :bootsy_image_gallery_id,
+            class: 'bootsy_image_gallery_id'
+          )
         end
       end
 
@@ -57,25 +62,30 @@ module Bootsy
     end
 
     def tag_class(options)
-      classes = if options[:class].blank?
-        []
-      elsif options[:class].kind_of?(Array)
-        options[:class]
-      else
-        [options[:class]]
-      end
+      classes =
+        if options[:class].blank?
+          []
+        elsif options[:class].is_a?(Array)
+          options[:class]
+        else
+          [options[:class]]
+        end
 
       classes << 'bootsy_text_area'
     end
 
     def data_options(options)
-      (options[:data] || {}).merge Hash[ bootsy_options(options).map { |k,v| ["bootsy-#{k}", v] } ]
+      (options[:data] || {}).merge(
+        Hash[bootsy_options(options).map do |key, value|
+          ["bootsy-#{key}", value]
+        end]
+      )
     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/simple_form/bootsy_input.rb

@@ -1,19 +1,23 @@
 require 'simple_form'
 
+# Public: A SimpleForm Input to wrap Bootsy areas
 class BootsyInput < SimpleForm::Inputs::Base
   enable :placeholder, :maxlength, :container, :editor_options, :uploader
 
   def input(wrapper_options = nil)
     bootsy_params = [:editor_options, :container, :uploader]
-    input_html_options.merge!(input_options.select {|k,v| bootsy_params.include?(k) })
+    input_html_options.merge!(
+      input_options.select { |key, _| bootsy_params.include?(key) }
+    )
 
     # Check presence of `merge_wrapper_options` to keep
     # compatibility with both Simple Form 3.0 and 3.1.
-    merged_input_options = if respond_to?(:merge_wrapper_options, true)
-      merge_wrapper_options(input_html_options, wrapper_options)
-    else
-      input_html_options
-    end
+    merged_input_options =
+      if respond_to?(:merge_wrapper_options, true)
+        merge_wrapper_options(input_html_options, wrapper_options)
+      else
+        input_html_options
+      end
 
     @builder.bootsy_area(attribute_name, merged_input_options)
   end

data/lib/bootsy/version.rb

@@ -1,3 +1,4 @@
+# Public: The gem version
 module Bootsy
-  VERSION = '2.0.11'
+  VERSION = '2.0.12'
 end

data/lib/generators/bootsy/install_generator.rb

@@ -1,5 +1,7 @@
 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__)
 
@@ -8,42 +10,54 @@ module Bootsy
       end
 
       def copy_locale
-        copy_file '../../../../config/locales/bootsy.en.yml', 'config/locales/bootsy.en.yml'
+        copy_file '../../../../config/locales/bootsy.en.yml',
+                  'config/locales/bootsy.en.yml'
       end
 
       def add_assets
+        assets_entries.each do |params|
+          if File.exist?(params[:original])
+            insert_into_file(params)
+          else
+            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 'bootsy.rb', 'config/initializers/bootsy.rb'
+      end
+
+      def insert_into_file(params)
+        if File.binread(params[:original]).include?(params[:skip_if])
+          say_status('skipped', "insert into #{params[:original]}", :yellow)
+        else
+          super(
+            params[:original],
+            params[:content],
+            params[:position]
+          )
+        end
+      end
+
+      private
+
+      def assets_entries
         [
           {
             original: 'app/assets/javascripts/application.js',
             skip_if: 'require bootsy',
             content: "\n//= require bootsy",
-            position: {
-              after: '//= require jquery_ujs'
-            }
+            position: { after: '//= require jquery_ujs' }
           },
           {
             original: 'app/assets/stylesheets/application.css',
             skip_if: 'require bootsy',
             content: "\n *= require bootsy",
-            position: {
-              after: '*= require_self'
-            }
+            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
-            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 'bootsy.rb', 'config/initializers/bootsy.rb'
+        ]
       end
     end
   end