bootsy 0.0.1 → 0.0.2

data/README.md

@@ -1,7 +1,7 @@
 Bootsy
 ==========
 
-*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/jnicklas/carrierwave).
+*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/jnicklas/carrierwave).
 
 
 ## Requirements
@@ -71,7 +71,7 @@ Bootsy defines some i18n keys. The english translation is automatically added to
 
 ## Mongoid support
 
-Par default, Bootsy only supports ActiveRecord. A [Mongoid support](https://github.com/volmer/bootsy-mongoid) is currently in development.
+Par default, Bootsy only supports ActiveRecord. In order to use Bootsy with Mongoid, please use [bootsy-mongoid](https://github.com/volmer/bootsy-mongoid) instead.
 
 
 ## License

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

@@ -1,4 +1,5 @@
 //= require jquery.remotipart
 //= require bootsy/wysihtml5
 //= require bootsy/bootstrap-wysihtml5
-//= require bootsy/bootsy
+//= require bootsy/bootsy
+//= require_directory ../bootsy/locales

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

@@ -26,7 +26,7 @@
                                    "<a class='btn' data-wysihtml5-command='insertUnorderedList' title='" + locale.lists.unordered + "'><i class='icon-list'></i></a>" +
                                    "<a class='btn' data-wysihtml5-command='insertOrderedList' title='" + locale.lists.ordered + "'><i class='icon-th-list'></i></a>" +
                                    "<a class='btn' data-wysihtml5-command='Outdent' title='" + locale.lists.outdent + "'><i class='icon-indent-right'></i></a>" +
-                                   "<a class='btn' data-wysihtml5-command='Indent' title='" + locale.lists.indered + "'><i class='icon-indent-left'></i></a>" +
+                                   "<a class='btn' data-wysihtml5-command='Indent' title='" + locale.lists.indent + "'><i class='icon-indent-left'></i></a>" +
                                "</div>" +
                            "</li>",
             "link":        "<li>" +

data/app/assets/javascripts/bootsy/{bootsy.js → bootsy.js.erb}

@@ -36,7 +36,7 @@ $(document).ready(function(){
     bootsyRefreshGallery(element);
   });
 
-  wysihtml5Editor = $('textarea.bootsy_text_area').wysihtml5({"image": false, "imageUpload": true, imageUploadCallback: bootsyOpenImageGallery}).data("wysihtml5").editor;
+  wysihtml5Editor = $('textarea.bootsy_text_area').wysihtml5({"image": false, "imageUpload": true, imageUploadCallback: bootsyOpenImageGallery, locale: "<%= I18n.default_locale %>"}).data("wysihtml5").editor;
 
   element.on('hide', function() {
     wysihtml5Editor.currentView.element.focus();

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

@@ -0,0 +1,34 @@
+/**
+ * Brazilian portuguese translation for bootstrap-wysihtml5
+ */
+(function($){
+    $.fn.wysihtml5.locale["pt-BR"] = {
+        font_styles: {
+              normal: "Texto normal",
+              h1: "Título 1",
+              h2: "Título 2"
+        },
+        emphasis: {
+              bold: "Negrito",
+              italic: "Itálico",
+              underline: "Sublinhado"
+        },
+        lists: {
+              unordered: "Lista",
+              ordered: "Lista numerada",
+              outdent: "Remover indentação",
+              indent: "Indentar"
+        },
+        link: {
+              insert: "Inserir link",
+              cancel: "Cancelar"
+        },
+        image: {
+              insert: "Inserir imagem",
+              cancel: "Cancelar"
+        },
+        html: {
+            edit: "Editar HTML"
+        }
+    };
+}(jQuery));

data/app/controllers/bootsy/images_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "bootsy/application_controller"
 
 module Bootsy
-  class ImagesController < ApplicationController
+  class ImagesController < Bootsy::ApplicationController
     # GET /images
     # GET /images.json
     def index

data/app/helpers/bootsy/application_helper.rb

@@ -1,8 +1,12 @@
 module Bootsy
   module ApplicationHelper
     def refresh_btn gallery, collection
-      gallery = nil unless gallery.nil? || gallery.persisted?
-      link_to t('bootsy.refresh'), [bootsy, gallery, collection], remote: true, :class => 'btn btn-mini refresh_btn'
+      link_to t('bootsy.refresh'), [bootsy, resource_or_nil(gallery), collection], remote: true, :class => 'btn btn-mini refresh_btn'
+    end
+
+    def resource_or_nil resource
+      resource = nil unless resource.nil? || resource.persisted?
+      resource
     end
   end
 end

data/app/uploaders/bootsy/image_uploader.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+module Bootsy
+  class ImageUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    include Sprockets::Helpers::RailsHelper
+    include Sprockets::Helpers::IsolatedHelper
+
+    storage :file
+
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{model.id}"
+    end
+
+    # Process files as they are uploaded:
+    process :resize_to_limit => [940, 940]
+
+    version :large do
+      process :resize_to_fit => [600, 600]
+    end
+
+    version :medium do
+      process :resize_to_fit => [300, 300]
+    end
+
+    version :small do
+      process :resize_to_fit => [160, 160]
+    end
+
+    version :thumb do
+      process :resize_to_fill => [60, 60]
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 <h3><%= t 'bootsy.image.new' %></h3>
 
-<%= form_for [bootsy, (image.image_gallery || Bootsy::ImageGallery), image], remote: true, html: {:class => 'bootsy'} do |f| %>
+<%= form_for [bootsy, resource_or_nil(image.image_gallery), image], remote: true, html: {:class => 'bootsy'} do |f| %>
   <% if image.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(image.errors.count, "error") %> prohibited this image from being saved:</h2>

data/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/{app/models/bootsy → lib/bootsy/activerecord}/image.rb

@@ -7,5 +7,9 @@ module Bootsy
     attr_accessible :image_file
 
     validates_presence_of :image_file, :image_gallery_id
+
+    def pau
+      'pica'
+    end
   end
 end

data/lib/bootsy/core_ext.rb

@@ -6,7 +6,7 @@ module Bootsy
       options.delete :resource
 
       if resource.nil? && (object.nil? || object.is_a?(String) || object.is_a?(Array) || object.is_a?(Symbol))
-        raise PedroError
+        raise 'Bootsy area needs a model or a resource as its option'
       end
 
       object_name = object.class.name.underscore

data/lib/bootsy/engine.rb

@@ -1,5 +1,6 @@
 module Bootsy
-  class Engine < ::Rails::Engine
+  class Engine < Rails::Engine
+
     isolate_namespace Bootsy
 
     config.generators do |g|                                                               
@@ -12,5 +13,19 @@ module Bootsy
         helper Bootsy::ApplicationHelper
       end
     end
+
+    config.after_initialize do
+      if defined?(BOOTSY_ORM)
+        orm = BOOTSY_ORM
+      else
+        orm = :activerecord
+      end
+
+
+      case orm
+      when :activerecord
+        Dir[File.expand_path('../activerecord/*.rb', __FILE__)].each {|f| require f }
+      end
+    end
   end
 end

data/lib/bootsy/version.rb

@@ -1,3 +1,3 @@
 module Bootsy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tasks/cucumber.rake

@@ -0,0 +1,65 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'rerun'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+
+    task :statsetup do
+      require 'rails/code_statistics'
+      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+    end
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+
+  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+  task 'db:test:prepare' do
+  end
+
+  task :stats => 'cucumber:statsetup'
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: remotipart
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: remotipart
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 3.2.6
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,23 +108,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Bootsy is a WYSIWIG editor for Rails applications based on WYSIHTML5
-  and Twitter Bootstrap. It integrates images uploads using Carrierwave, as an image
+  and Twitter Bootstrap. It integrates images uploads using CarrierWave, as an image
   gallery scoped in models of your application.
 email:
 - lrvolmer@gmail.com
@@ -180,9 +164,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/uploaders/image_uploader.rb
+- app/uploaders/bootsy/image_uploader.rb
 - app/helpers/bootsy/application_helper.rb
-- app/helpers/bootsy/images_helper.rb
 - app/views/bootsy/images/_index.html.erb
 - app/views/bootsy/images/index.js.erb
 - app/views/bootsy/images/destroy.js.erb
@@ -191,27 +174,30 @@ files:
 - app/views/bootsy/images/_modal.html.erb
 - app/assets/stylesheets/bootsy/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootsy/application.css
+- app/assets/javascripts/bootsy/locales/bootstrap-wysihtml5.pt-BR.js
 - app/assets/javascripts/bootsy/wysihtml5.js
 - app/assets/javascripts/bootsy/application.js
 - app/assets/javascripts/bootsy/bootstrap-wysihtml5.js
-- app/assets/javascripts/bootsy/bootsy.js
-- app/models/bootsy/image.rb
-- app/models/bootsy/image_gallery.rb
+- app/assets/javascripts/bootsy/bootsy.js.erb
 - app/controllers/bootsy/application_controller.rb
 - app/controllers/bootsy/images_controller.rb
 - config/locales/pt-BR.yml
 - config/locales/en.yml
+- config/cucumber.yml
 - config/bootsy.yml
 - config/routes.rb
 - db/migrate/20120624171333_create_bootsy_images.rb
 - db/migrate/20120628124845_create_bootsy_image_galleries.rb
 - lib/generators/install_generator.rb
+- lib/tasks/cucumber.rake
 - lib/tasks/bootsy_tasks.rake
 - lib/bootsy.rb
 - lib/bootsy/version.rb
 - lib/bootsy/engine.rb
 - lib/bootsy/media_container.rb
 - lib/bootsy/core_ext.rb
+- lib/bootsy/activerecord/image.rb
+- lib/bootsy/activerecord/image_gallery.rb
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -229,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2628595835958805564
+      hash: 792521922030323784
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2628595835958805564
+      hash: 792521922030323784
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/helpers/bootsy/images_helper.rb

@@ -1,4 +0,0 @@
-module Bootsy
-  module ImagesHelper
-  end
-end

data/app/uploaders/image_uploader.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-
-class ImageUploader < CarrierWave::Uploader::Base
-
-  include CarrierWave::MiniMagick
-
-  include Sprockets::Helpers::RailsHelper
-  include Sprockets::Helpers::IsolatedHelper
-
-  storage :file
-
-
-  def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{model.id}"
-  end
-
-  # Process files as they are uploaded:
-  process :resize_to_limit => [940, 940]
-
-  version :large do
-    process :resize_to_fit => [600, 600]
-  end
-
-  version :medium do
-    process :resize_to_fit => [300, 300]
-  end
-
-  version :small do
-    process :resize_to_fit => [160, 160]
-  end
-
-  version :thumb do
-    process :resize_to_fill => [60, 60]
-  end
-
-  def extension_white_list
-    %w(jpg jpeg gif png)
-  end
-end