bootsy 0.1.8 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07c76b46b43c59c11ae610157bb89a833de61fff
+  data.tar.gz: a1fa27d625b2f313fdf30de95e94ea97b11f8862
+SHA512:
+  metadata.gz: f826930f5425b4fcf2be6d85a4ac983a997b094b64d3afac82a0184d9a773835bef03262531b41c10225228ea37ffbe23f2c603ff1978bd0f2859ec4cdfb0202
+  data.tar.gz: 51a5e794cebc1940982c7e1aa0e374a6013f38e1f27871ff00e923b723e83f5e29021ddfa9c68f28ea961e1af6fdcdb689cd50fb22eaf7b8f80f7804b24dd866

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Volmer Soares
+Copyright 2013 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

@@ -1,5 +1,6 @@
 # Bootsy
 
+[![Gem Version](https://badge.fury.io/rb/bootsy.png)](http://badge.fury.io/rb/bootsy)
 [![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)
 
@@ -8,10 +9,10 @@
 
 ## Requirements
 
-* Ruby MRI >= 1.9.3;
+* Ruby >= 1.9.3;
 * ImageMagick or GraphicsMagick (for MiniMagick);
-* Rails >= 3.2.6;
-* [Twitter Bootstrap](http://twitter.github.com/bootstrap/) assets added on your application.
+* Rails ~> 3.2 (Rails 4 support is comming soon);
+* [Twitter Bootstrap](http://twitter.github.com/bootstrap/) properly added on your application.
 
 
 ## Installation
@@ -33,7 +34,7 @@
   rails g bootsy:install
   ```
 
-4. Add and run migrations (if you are using ActiveRecord):
+4. Add and run migrations (if you're using ActiveRecord):
   ```console
   rake bootsy:install:migrations
   rake db:migrate
@@ -42,7 +43,7 @@
 
 ## Usage
 
-Just call the brand new method `bootsy_area` in your `FormBuilder` instances, in the same way you call the basic `textarea` method. Example:
+Just call the brand new method `bootsy_area` in your `FormBuilder` instances, the same way you'd call the basic `textarea` method. Example:
 
   ```erb
   <%= form_for(@post) do |f| %>
@@ -56,7 +57,7 @@ Just call the brand new method `bootsy_area` in your `FormBuilder` instances, in
   <% end %>
   ```
 
-Bootsy will group the uploaded image files as galleries and associate them to one of your models. For example, if you have a `Post` model and you want to use `bootsy_area` with it, then you should include the `Bootsy::Container` module:
+Bootsy will group the uploaded images as galleries and associate them to one of your models. For example, if you have a `Post` model and you want to use `bootsy_area` with it, then you should include the `Bootsy::Container` module:
 
   ```ruby
   class Post < ActiveRecord::Base
@@ -68,12 +69,12 @@ Bootsy will group the uploaded image files as galleries and associate them to on
 
 ## Editor options
 
-It's possible to customize how the editor is displayed and its behavior by passing a hash `editor_options` to your `bootsy_area`.
+It is possible to customize how the editor is displayed and its behavior by passing a hash `editor_options` to your `bootsy_area`.
 
 
 ### Buttons
 
-You can enable/disable the buttons available in the editor. For example, if you want to disable the link and color buttons:
+You can enable/disable the buttons available on the editor. For example, if you want to disable the link and color buttons:
 
   ```erb
   <%= f.bootsy_area :my_attribute, editor_options: {link: false, color: false} %>
@@ -83,30 +84,25 @@ Available options are: `:font_styles`, `:emphasis`, `:lists`, `:html`, `:link`,
 
 ### Alert for usaved changes
 
-By default, Bootsy alerts for unsaved changes if the user attempts to unload the window. You can disable it by doing:
+By default, Bootsy alerts for unsaved changes if the user attempts to unload the window. You can disable this behaviour by doing:
 
   ```erb
   <%= f.bootsy_area :my_attribute, editor_options: {alert_unsaved: false} %>
   ```
 
-### Uploader
+## Uploader
 
-It is also possible to disable the image upload feature entirely. This way the user can insert images in his/her text by providing an image url. Simple and easy:
-
-  ```erb
-  <%= f.bootsy_area :my_attribute, editor_options: {uploader: false} %>
-  ```
-*Note*: this option is automatically defined if you use `bootsy_area` without a `Bootsy::Container` model.
+It's also possible to use Bootsy without the image upload feature. Just call `bootsy_area` in a form builder not associated to a `Bootsy::Container` model. This way users can insert images in their texts by providing an image url.
 
 
 ## Configuration
 
-You can set the image sizes available (small, medium, large and/or its original), its dimensions and more. Take a look at the initalizer file, `/config/initializers/bootsy.rb`.
+You can set the default editor options, image sizes available (small, medium, large and/or its original), its dimensions and more. Take a look at the initalizer file, `/config/initializers/bootsy.rb`.
 
 
 ## I18n
 
-Bootsy defines some i18n keys. The ruby english translation is automatically added to your `config/locales` directory as `bootsy.en.yml`. You can follow that template in order to translate Bootsy to your language. You can find some examples [here](https://github.com/volmer/bootsy/tree/master/config/locales). It is also necessary to add a translation for Bootstrap-wysihtml5, the javascript editor, in your assets pipeline. Instructions [here](https://github.com/jhollingworth/bootstrap-wysihtml5#i18n). If you are using the alert for unsaved changes, you have to define a translation for it as well. Just follow [this example](https://github.com/volmer/bootsy/tree/master/app/assets/bootsy/locales/bootsy.pt-BR.js).
+Bootsy defines some i18n keys. The english translation is automatically added to your `config/locales` directory as `bootsy.en.yml`. You can follow that template in order to translate Bootsy to your language. You can find some examples [here](https://github.com/volmer/bootsy/tree/master/config/locales). It is also necessary to add a translation for Bootstrap-wysihtml5, the javascript editor, in your assets pipeline. Instructions [here](https://github.com/jhollingworth/bootstrap-wysihtml5#i18n). If you are using the alert for unsaved changes, you have to define a translation for it as well. Just follow [this example](https://github.com/volmer/bootsy/tree/master/app/assets/bootsy/locales/bootsy.pt-BR.js).
 
 
 ## Mongoid support
@@ -121,4 +117,4 @@ Do you want to use Bootsy alongside with [SimpleForm](https://github.com/platafo
 
 ## License
 
-MIT License. Copyright 2012 Volmer Soares
+MIT License. Copyright 2013 Volmer Soares

data/app/assets/javascripts/bootsy/bootstrap-wysihtml5.js

@@ -5,7 +5,7 @@
         "font-styles": function(locale, options) {
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li class='dropdown'>" +
-              "<a class='btn dropdown-toggle" + size + "' data-toggle='dropdown' href='#'>" +
+              "<a class='btn dropdown-toggle" + size + "' data-toggle='dropdown' href='#' title='" + locale.font_styles.title + "'>" +
               "<i class='icon-font'></i>&nbsp;<span class='current-font'>" + locale.font_styles.normal + "</span>&nbsp;<b class='caret'></b>" +
               "</a>" +
               "<ul class='dropdown-menu'>" +
@@ -92,7 +92,7 @@
         "color": function(locale, options) {
             var size = (options && options.size) ? ' btn-'+options.size : '';
             return "<li class='dropdown'>" +
-              "<a class='btn dropdown-toggle" + size + "' data-toggle='dropdown' href='#' tabindex='-1'>" +
+              "<a class='btn dropdown-toggle" + size + "' data-toggle='dropdown' href='#' tabindex='-1' title='" + locale.colours.title + "'>" +
                 "<span class='current-color'>" + locale.colours.black + "</span>&nbsp;<b class='caret'></b>" +
               "</a>" +
               "<ul class='dropdown-menu'>" +
@@ -467,6 +467,7 @@
     var locale = $.fn.wysihtml5.locale = {
         en: {
             font_styles: {
+                title: "Font style",
                 normal: "Normal text",
                 h1: "Heading 1",
                 h2: "Heading 2",
@@ -495,6 +496,7 @@
                 edit: "Edit HTML"
             },
             colours: {
+                title: "Text color",
                 black: "Black",
                 silver: "Silver",
                 gray: "Grey",

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

@@ -60,7 +60,7 @@ window.Bootsy = (function(){
 
   Bootsy.ready = function(){
     if($('textarea.bootsy_text_area').length > 0){
-      Bootsy.locale = $('textarea.bootsy_text_area').attr('data-locale');
+      Bootsy.locale = $('textarea.bootsy_text_area').attr('data-bootsy-locale') || $('html').attr('lang') || 'en';
 
       var templates = {
         customCommand: function(locale, options) {
@@ -103,11 +103,11 @@ window.Bootsy = (function(){
 
       Bootsy.editorOptions.stylesheets = ["/assets/bootsy/bootsy.css"];
 
-      if($('textarea.bootsy_text_area').attr('data-image') == 'false'){
+      if($('textarea.bootsy_text_area').attr('data-bootsy-image') == 'false'){
         Bootsy.editorOptions.image = false;
       }else{
 
-        if($('textarea.bootsy_text_area').attr('data-uploader') != 'false'){
+        if($('textarea.bootsy_text_area').attr('data-bootsy-uploader') != 'false'){
           Bootsy.editorOptions.image = false;
           Bootsy.editorOptions.customCommand = true;
           Bootsy.editorOptions.customCommandCallback = Bootsy.openImageGallery;
@@ -156,16 +156,16 @@ window.Bootsy = (function(){
         }
       }
 
-      if($('textarea.bootsy_text_area').attr('data-font-styles') == 'false') Bootsy.editorOptions['font-styles'] = false;
-      if($('textarea.bootsy_text_area').attr('data-emphasis') == 'false') Bootsy.editorOptions.emphasis = false;
-      if($('textarea.bootsy_text_area').attr('data-lists') == 'false') Bootsy.editorOptions.lists = false;
-      if($('textarea.bootsy_text_area').attr('data-html') == 'true') Bootsy.editorOptions.html = true;
-      if($('textarea.bootsy_text_area').attr('data-link') == 'false') Bootsy.editorOptions.link = false;
-      if($('textarea.bootsy_text_area').attr('data-color') == 'false') Bootsy.editorOptions.color = false;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-font-styles') == 'false') Bootsy.editorOptions['font-styles'] = false;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-emphasis') == 'false') Bootsy.editorOptions.emphasis = false;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-lists') == 'false') Bootsy.editorOptions.lists = false;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-html') == 'true') Bootsy.editorOptions.html = true;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-link') == 'false') Bootsy.editorOptions.link = false;
+      if($('textarea.bootsy_text_area').attr('data-bootsy-color') == 'false') Bootsy.editorOptions.color = false;
 
       Bootsy.editor = $('textarea.bootsy_text_area').wysihtml5(Bootsy.editorOptions).data("wysihtml5").editor;
 
-      if($('textarea.bootsy_text_area').attr('data-alert-unsaved') != 'false'){
+      if($('textarea.bootsy_text_area').attr('data-bootsy-alert-unsaved') != 'false'){
         window.onbeforeunload = Bootsy.alertUnsavedChanges;
       }
 

data/app/assets/javascripts/bootsy/locales/bootstrap-wysihtml5.pt-BR.js

@@ -4,6 +4,7 @@
 (function($){
     $.fn.wysihtml5.locale["pt-BR"] = {
         font_styles: {
+            title: "Estilo de fonte",
             normal: "Texto normal",
             h1: "Título 1",
             h2: "Título 2",
@@ -32,6 +33,7 @@
             edit: "Editar HTML"
         },
         colours: {
+            title: "Cor do texto",
             black: "Preto",
             silver: "Prata",
             gray: "Cinza",

data/lib/bootsy.rb

@@ -9,6 +9,10 @@ require 'bootsy/core_ext'
 module Bootsy
   ## CONFIGURATION OPTIONS
 
+  # Default editor options
+  mattr_accessor :editor_options
+  @@editor_options = {}
+
   # Image versions available
   mattr_accessor :image_versions_available
   @@image_versions_available = [:small, :medium, :large, :original]

data/lib/bootsy/form_helper.rb

@@ -1,30 +1,63 @@
 module Bootsy
   module FormHelper
-    def bootsy_area object, method, options = {}
-      foreign_container = options.delete :container
+    def bootsy_area(object, method, options = {})
+      container = options.delete :container
+      enable_uploader = enable_uploader? object, options.delete(:uploader), container
+      bootsy_options = Bootsy.editor_options.merge(options.delete(:editor_options) || {})
+      bootsy_options[:uploader] = false unless enable_uploader
 
-      data = options.delete(:editor_options) || {}
-      data[:locale] = I18n.locale
+      options[:data] = data_options options, bootsy_options
+      options[:class] = class_attr options
 
-      data[:uploader] = false unless foreign_container.kind_of?(Container) || (foreign_container.nil? && object.kind_of?(Container))
+      output = self.text_area object_name(object), method, options
 
-      enable_uploader = !(data[:uploader] == false)
+      if enable_uploader
+        output += self.render 'bootsy/images/modal', {container: container || object}
 
-      options[:data] = options[:data] ? options[:data] + data : data
+        if container.blank? || (container == object)
+          output += self.hidden_field object_name(object), :bootsy_image_gallery_id, class: 'bootsy_image_gallery_id'
+        end
+      end
+      
+      output
+    end
 
-      object_name = object.class.name.underscore
+    private
+
+    def enable_uploader?(object, uploader, container)
+      if uploader == false
+        false
+      elsif container.is_a? Container
+        true
+      elsif container.blank? && object.is_a?(Container)
+        true
+      else
+        false
+      end
+    end
 
-      output = enable_uploader ? self.render('bootsy/images/modal', {container: foreign_container || object}) : raw('')
+    def class_attr(options)
+      classes = if options[:class].blank?
+        []
+      elsif options[:class].kind_of?(Array)
+        options[:class]
+      else
+        [options[:class]]
+      end
 
-      options[:class] = (options[:class].nil? ? [] : (options[:class].kind_of?(Array) ? options[:class] : [options[:class]])) + [:bootsy_text_area]
-    
-      output += self.text_area object_name, method, options
+      classes << 'bootsy_text_area'
+    end
 
-      if enable_uploader && (foreign_container.nil? || (foreign_container == object))
-        output += self.hidden_field object_name, :bootsy_image_gallery_id, :class => 'bootsy_image_gallery_id'
+    def object_name(object)
+      if object.is_a?(String) || object.is_a?(Symbol)
+        object
+      else
+        object.class.name.underscore
       end
-      
-      output
+    end
+
+    def data_options(options, bootsy_options)
+      (options[:data] || {}).merge Hash[bootsy_options.map{|k,v|["bootsy-#{k}",v]}]
     end
   end
 end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

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

@@ -1,5 +1,16 @@
 # Use this setup block to configure all options available in Bootsy.
 Bootsy.setup do |config|
+  # Default editor options
+  # You can override them locally by passing an editor_options hash to bootsy_area
+  # config.editor_options = {
+  #   font_styles: true,
+  #   emphasis: true,
+  #   lists: true,
+  #   html: false,
+  #   link: true,
+  #   image: true,
+  #   color: true
+  # }
 
   # Image versions available
   # Possible values: :small, :medium, :large and/or :original

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Volmer Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,115 +41,87 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: remotipart
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: cucumber-rails
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 description: A beautiful WYSIWYG editor with image uploads for Rails.
 email:
 - volmerius@gmail.com
@@ -207,32 +174,25 @@ files:
 - README.md
 homepage: http://github.com/volmer/bootsy
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2775965369323801409
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2775965369323801409
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A beautiful WYSIWYG editor with image uploads for Rails.
 test_files: []