bootsy 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4cd22d7f1a69efb5e1bce79204237a5fb6f7dc3
-  data.tar.gz: 2c7e22f00ea3e679be68a0ed662130a2ff4977c2
+  metadata.gz: a690695a8fe4970f189b8f070ec20a95a9a64102
+  data.tar.gz: ec879d16e88ec7f56fff78bc5f1351ef08848246
 SHA512:
-  metadata.gz: 82b4ce1c063a5a75befa4dbc4180b5efad94eb57eb526b9c8a3a20828cde1f443ea715837d9f1a8a327ec25498b91d2d2fba9578b4ec6c40db4ac0f151f64dc9
-  data.tar.gz: 70f7482591efc70538077e4dfe9d22f50a88bfe55c3b50dc06b7e4468c29a221749f59045015ff155d1943d8f3fef53d0a026c8ae9db4923446f4faa20442d53
+  metadata.gz: 10b8ff7d3b323ebb9e647ee150f4ca7d53132e8c395ff65be57063886e0d668340283b35dcadf739ad9a7d564aad31c7b4eecd8c44f07594f8bf3c90b2b51b86
+  data.tar.gz: 15f0b8bdf3f6d417537904fb238ec74255c9bc29e1e95234b919d2b828e427b5b964295cb9c11d8af3e222df503b22f2bed6e57ef4b56e50a9aa770795c3449f

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

@@ -7,7 +7,6 @@ Bootsy.Area = function($el) {
   this.modal          = $el.siblings('.bootsy-modal');
   this.locale         = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
   this.unsavedChanges = false;
-  this.initialized    = false;
 
   this.options = {
     locale: this.locale,
@@ -210,7 +209,7 @@ Bootsy.Area.prototype.setImageGalleryId = function(id) {
 Bootsy.Area.prototype.init = function() {
   var insert;
 
-  if (!this.initialized) {
+  if (!this.$el.data('bootsy-initialized')) {
     insert = this.insertImage.bind(this);
 
     if ((this.options.image === true) && (this.options.uploader === true)) {
@@ -300,6 +299,6 @@ Bootsy.Area.prototype.init = function() {
     this.hideRefreshButton();
     this.hideEmptyAlert();
 
-    this.initialized = true;
+    this.$el.data('bootsy-initialized', true);
   }
 };

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

@@ -4,19 +4,24 @@ 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 = {};
+  if (!Bootsy.areas) {
+    Bootsy.areas = {};
+  }
 
-  $('textarea.bootsy_text_area').filter(':visible').each(function(index) {
-    var area = new Bootsy.Area($(this));
-    var areaIdx = $(this).attr('id') || index;
+  $('textarea.bootsy_text_area').each(function(index) {
+    if (!$(this).data('bootsy-initialized')) {
+      var area = new Bootsy.Area($(this));
+      var areaIdx = $(this).attr('id') || index;
 
-    if(Bootsy.areas[areaIdx] !== undefined) {
-      areaIdx = $(this).attr('id') + index;
-    }
+      /* There's always people who let elements share ids */
+      if(Bootsy.areas[areaIdx] !== undefined) {
+        areaIdx = $(this).attr('id') + index;
+      }
 
-    area.init();
+      area.init();
 
-    Bootsy.areas[areaIdx] = area;
+      Bootsy.areas[areaIdx] = area;
+    }
   });
 };
 

data/lib/bootsy/activerecord/image_gallery.rb

@@ -1,6 +1,6 @@
 module Bootsy
   class ImageGallery < ActiveRecord::Base
-    belongs_to :bootsy_resource, polymorphic: true
+    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 }

data/lib/bootsy/container.rb

@@ -1,28 +1,50 @@
-require 'active_support/concern'
-
 module Bootsy
+  # Public: Methods and attributes to turn any
+  # model into a Bootsy Container.
+  #
+  # Examples
+  #
+  #   class Post < ActiveRecord::Base
+  #     include Bootsy::Container
+  #   end
   module Container
-
     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
 
+        # 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
-          if self.bootsy_image_gallery.nil?
-            nil
-          else
-            self.bootsy_image_gallery.id
-          end
+          self.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 self.bootsy_image_gallery.nil? && !value.blank?
-            ig = Bootsy::ImageGallery.find(value)
-            self.bootsy_image_gallery = ig
-            ig.bootsy_resource = self
-            ig.save
+            image_gallery                 = Bootsy::ImageGallery.find(value)
+            self.bootsy_image_gallery     = image_gallery
+            image_gallery.bootsy_resource = self
+            image_gallery.save
           end
         end
       end

data/lib/bootsy/simple_form/bootsy_input.rb

@@ -3,9 +3,18 @@ require 'simple_form'
 class BootsyInput < SimpleForm::Inputs::Base
   enable :placeholder, :maxlength, :container, :editor_options, :uploader
 
-  def input
+  def input(wrapper_options = nil)
     bootsy_params = [:editor_options, :container, :uploader]
-    input_html_options.merge! input_options.select {|k,v| bootsy_params.include? k }
-    @builder.bootsy_area attribute_name, input_html_options
+    input_html_options.merge!(input_options.select {|k,v| bootsy_params.include?(k) })
+
+    # 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
+
+    @builder.bootsy_area(attribute_name, merged_input_options)
   end
 end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick