markitup_rails 0.1.1 → 0.2.0

data/Gemfile

@@ -7,9 +7,10 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
 gem "rails", "~> 3.1"
-gem "bluecloth"
+gem "bluecloth"
+gem "bb-ruby", :git => "git://github.com/marcandre/bb-ruby.git"

data/Gemfile.lock

@@ -1,3 +1,9 @@
+GIT
+  remote: git://github.com/marcandre/bb-ruby.git
+  revision: 77a4b3c63e06e053cfbaf04331d9dc31f505c247
+  specs:
+    bb-ruby (0.9.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -92,8 +98,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bb-ruby!
   bluecloth
-  bundler (~> 1.0.0)
+  bundler
   jeweler (~> 1.6.4)
   rails (~> 3.1)
   rcov

data/README.rdoc

@@ -46,6 +46,31 @@ Add the markitup_rails gem to your Gemfile.  In Gemfile:
       $("textarea").markItUp(myMarkdownSettings);
     });
 
+== BBCode
+
+    /* app/assets/stylesheets/application.css */
+    /* the following directives will include the markitup CSS */
+    /* the skins/markitup CSS will define how the text area will look */
+    /* the sets/bbcode CSS defines the bbcode-specific buttons */
+
+    /*
+    *= require skins/markitup/style.css
+    *= require sets/bbcode/style.css
+    */
+
+    // in app/assets/javascripts/application.js
+
+    // include the main MarkItUp javascript
+    //= require jquery.markitup
+
+    // include a set, which defines the javascript rules for the particular parser. BBCode is included with this:
+    // The sets/bbcode/set.js file will define a Javascript variable called "myBBCodeSettings".
+    //= require ./sets/bbcode/set.js
+
+    $(document).ready(function(){
+      $("textarea").markItUp(myBBCodeSettings);
+    });
+
 == HTML
 
     /* app/assets/stylesheets/application.css */
@@ -85,7 +110,8 @@ The engine also comes with a simple controller that MarkItUp can send text to yo
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 == Contributors
-* {Ze Jin}:[http://www.jinze.info/]
+
+Ze Jin, http://www.jinze.info/
 
 == License
 
@@ -97,4 +123,4 @@ Copyright (C) 2007-2011 Jay Salvat http:markitup.jaysalvat.com/
 
 markitup_rails 
 Copyright (C) 2011 Jeff Wigal
-http://dropkickstudios.com
+http://dropkickstudios.com

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline}
   gem.description = %Q{Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline}
   gem.email = "jeff@assignr.com"
-  gem.authors = ["Jeff Wigal"]
+  gem.authors = ["Jeff Wigal", "N4th4", "Ze Jin"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/app/assets/javascripts/sets/bbcode/set.js

@@ -0,0 +1,60 @@
+// ----------------------------------------------------------------------------
+// markItUp!
+// ----------------------------------------------------------------------------
+// Copyright (C) 2008 Jay Salvat
+// http://markitup.jaysalvat.com/
+// ----------------------------------------------------------------------------
+// BBCode tags example
+// http://en.wikipedia.org/wiki/Bbcode
+// ----------------------------------------------------------------------------
+// Feel free to add more tags
+// ----------------------------------------------------------------------------
+myBBCodeSettings = {
+    nameSpace:      'bbcode', // Useful to prevent multi-instances CSS conflict
+    previewTemplatePath:  '/markitup/previews.html',
+    previewParserPath: '/markitup/parsers/bbcode',
+    markupSet: [
+        {name:'Bold', key:'B', openWith:'[b]', closeWith:'[/b]'},
+        {name:'Italic', key:'I', openWith:'[i]', closeWith:'[/i]'},
+        {name:'Underline', key:'U', openWith:'[u]', closeWith:'[/u]'},
+        {separator:'---------------' },
+        {name:'Picture', key:'P', replaceWith:'[img][![Url]!][/img]'},
+        {name:'Link', key:'L', openWith:'[url=[![Url]!]]', closeWith:'[/url]', placeHolder:'Your text to link here...'},
+        {separator:'---------------' },
+        {   name:'Colors',
+            className:'colors',
+            openWith:'[color=[![Color]!]]',
+            closeWith:'[/color]',
+            dropMenu: [
+                {name:'Yellow', openWith:'[color=yellow]',      closeWith:'[/color]', className:"col1-1" },
+                {name:'Orange', openWith:'[color=orange]',      closeWith:'[/color]', className:"col1-2" },
+                {name:'Red',    openWith:'[color=red]',         closeWith:'[/color]', className:"col1-3" },
+
+                {name:'Blue',   openWith:'[color=blue]',        closeWith:'[/color]', className:"col2-1" },
+                {name:'Purple', openWith:'[color=purple]',      closeWith:'[/color]', className:"col2-2" },
+                {name:'Green',  openWith:'[color=green]',       closeWith:'[/color]', className:"col2-3" },
+
+                {name:'White',  openWith:'[color=white]',       closeWith:'[/color]', className:"col3-1" },
+                {name:'Gray',   openWith:'[color=gray]',        closeWith:'[/color]', className:"col3-2" },
+                {name:'Black',  openWith:'[color=black]',       closeWith:'[/color]', className:"col3-3" }
+            ]
+        },
+        {name:'Size', key:'S', openWith:'[size=[![Text size]!]]', closeWith:'[/size]',
+            dropMenu :[
+                {name:'Big', openWith:'[size=200]', closeWith:'[/size]' },
+                {name:'Normal', openWith:'[size=100]', closeWith:'[/size]' },
+                {name:'Small', openWith:'[size=50]', closeWith:'[/size]' }
+            ]
+        },
+        {separator:'---------------' },
+        {name:'Bulleted list', openWith:'[list]\n', closeWith:'\n[/list]'},
+        {name:'Numeric list', openWith:'[list=[![Starting number]!]]\n', closeWith:'\n[/list]'}, 
+        {name:'List item', openWith:'[*] '},
+        {separator:'---------------' },
+        {name:'Quotes', openWith:'[quote]', closeWith:'[/quote]'},
+        {name:'Code', openWith:'[code]', closeWith:'[/code]'}, 
+        {separator:'---------------' },
+        {name:'Clean', className:"clean", replaceWith:function(markitup) { return markitup.selection.replace(/\[(.*?)\]/g, "") } },
+        {name:'Preview', className:"preview", call:'preview' }
+    ]
+}

data/app/assets/stylesheets/sets/bbcode/style.css.scss

@@ -0,0 +1,93 @@
+/* -------------------------------------------------------------------
+// markItUp!
+// By Jay Salvat - http://markitup.jaysalvat.com/
+// ------------------------------------------------------------------*/
+.bbcode .markItUpButton1 a	{
+	background-image:image-url("sets/bbcode/bold.png");
+}
+.bbcode .markItUpButton2 a	{
+	background-image:image-url("sets/bbcode/italic.png");
+}
+.bbcode .markItUpButton3 a	{
+	background-image:image-url("sets/bbcode/underline.png");
+}
+.bbcode .markItUpButton4 a	{
+	background-image:image-url("sets/bbcode/picture.png");
+}
+.bbcode .markItUpButton5 a	{
+	background-image:image-url("sets/bbcode/link.png");
+}
+.bbcode .markItUpButton7 a	{
+	background-image:image-url("sets/bbcode/fonts.png");
+}
+.bbcode .markItUpButton8 a	{
+	background-image:image-url("sets/bbcode/list-bullet.png");
+}
+.bbcode .markItUpButton9 a	{
+	background-image:image-url("sets/bbcode/list-numeric.png");
+}
+.bbcode .markItUpButton10 a	{
+	background-image:image-url("sets/bbcode/list-item.png");
+}
+.bbcode .markItUpButton11 a	{
+	background-image:image-url("sets/bbcode/quotes.png");
+}
+.bbcode .markItUpButton12 a	{
+	background-image:image-url("sets/bbcode/code.png");
+}
+.bbcode .clean a {
+	background-image:image-url("sets/bbcode/clean.png");
+}
+.bbcode .preview a {
+	background-image:image-url("sets/bbcode/preview.png");
+}
+.bbcode .colors a {
+	background-image:image-url("sets/bbcode/colors.png");
+}
+	.bbcode .colors ul {
+		width:81px;
+		padding:1px;
+	}
+	.bbcode .colors  li {
+		border:1px solid white;
+		width:25px;     height:25px;
+		overflow:hidden;
+		padding:0px; margin:0px;
+		float:left;
+	}
+	.bbcode .colors ul a {
+		width:25px;     height:25px;
+	}
+	.bbcode .colors ul a:hover {
+		background-color:none;
+	}
+
+	.bbcode .colors .col1-1 a {
+		background:yellow;
+	}
+	.bbcode .colors .col1-2 a {
+		background:orange;
+	}
+	.bbcode .colors .col1-3 a {
+		background:red;
+	}
+
+	.bbcode .colors .col2-1 a {
+		background:blue;
+	}
+	.bbcode .colors .col2-2 a {
+		background:purple;
+	}
+	.bbcode .colors .col2-3 a {
+		background:green;
+	}
+
+	.bbcode .colors .col3-1 a {
+		background:white;
+	}
+	.bbcode .colors .col3-2 a {
+		background:gray;
+	}
+	.bbcode .colors .col3-3 a {
+		background:black;
+	}

data/app/controllers/markitup/parsers_controller.rb

@@ -3,4 +3,9 @@ class Markitup::ParsersController < ApplicationController
     @markitup =  BlueCloth.new(params[:data]).to_html
     render :layout => false
   end
-end
+
+  def bbcode
+    @markitup =  params[:data].bbcode_to_html
+    render :layout => false
+  end
+end

data/app/views/markitup/parsers/bbcode.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>markItUp! preview template</title>
+<%= stylesheet_link_tag "templates/preview" %>
+</head>
+<body>
+<%= raw @markitup%>
+</body>
+</html>

data/app/views/markitup/parsers/markdown.html.erb

@@ -6,6 +6,6 @@
 <%= stylesheet_link_tag "templates/preview" %>
 </head>
 <body>
-<%= sanitize @markitup%>  
+<%= sanitize @markitup%>
 </body>
 </html>

data/lib/markitup_rails.rb

@@ -13,3 +13,4 @@ module MarkitupRails
 end
 require 'engine'
 require 'bluecloth'
+require 'bb-ruby'

data/markitup_rails.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{markitup_rails}
-  s.version = "0.1.1"
+  s.name = "markitup_rails"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Wigal"]
-  s.date = %q{2012-03-06}
-  s.description = %q{Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline}
-  s.email = %q{jeff@assignr.com}
+  s.authors = ["Jeff Wigal", "N4th4", "Ze Jin"]
+  s.date = "2012-07-27"
+  s.description = "Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline"
+  s.email = "jeff@assignr.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,6 +24,21 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/assets/images/sets/bbcode/bold.png",
+    "app/assets/images/sets/bbcode/clean.png",
+    "app/assets/images/sets/bbcode/code.png",
+    "app/assets/images/sets/bbcode/colors.png",
+    "app/assets/images/sets/bbcode/fonts.png",
+    "app/assets/images/sets/bbcode/italic.png",
+    "app/assets/images/sets/bbcode/link.png",
+    "app/assets/images/sets/bbcode/list-bullet.png",
+    "app/assets/images/sets/bbcode/list-item.png",
+    "app/assets/images/sets/bbcode/list-numeric.png",
+    "app/assets/images/sets/bbcode/picture.png",
+    "app/assets/images/sets/bbcode/preview.png",
+    "app/assets/images/sets/bbcode/quotes.png",
+    "app/assets/images/sets/bbcode/stroke.png",
+    "app/assets/images/sets/bbcode/underline.png",
     "app/assets/images/sets/default/bold.png",
     "app/assets/images/sets/default/clean.png",
     "app/assets/images/sets/default/image.png",
@@ -66,14 +81,17 @@ Gem::Specification.new do |s|
     "app/assets/images/skins/simple/menu.png",
     "app/assets/images/skins/simple/submenu.png",
     "app/assets/javascripts/jquery.markitup.js",
+    "app/assets/javascripts/sets/bbcode/set.js",
     "app/assets/javascripts/sets/default/set.js",
     "app/assets/javascripts/sets/markdown/set.js",
+    "app/assets/stylesheets/sets/bbcode/style.css.scss",
     "app/assets/stylesheets/sets/default/style.css.scss",
     "app/assets/stylesheets/sets/markdown/style.css.scss",
     "app/assets/stylesheets/skins/markitup/style.css.scss",
     "app/assets/stylesheets/skins/simple/style.css.scss",
     "app/assets/stylesheets/templates/preview.css",
     "app/controllers/markitup/parsers_controller.rb",
+    "app/views/markitup/parsers/bbcode.html.erb",
     "app/views/markitup/parsers/markdown.html.erb",
     "config/routes.rb",
     "lib/engine.rb",
@@ -82,11 +100,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_markitup_rails.rb"
   ]
-  s.homepage = %q{http://github.com/jwigal/markitup_rails}
+  s.homepage = "http://github.com/jwigal/markitup_rails"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -94,23 +112,26 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
+      s.add_runtime_dependency(%q<bb-ruby>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.1"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
+      s.add_dependency(%q<bb-ruby>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 3.1"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
+    s.add_dependency(%q<bb-ruby>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: markitup_rails
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeff Wigal
+- N4th4
+- Ze Jin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 -05:00
-default_executable: 
+date: 2012-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,26 @@ dependencies:
         - 3
         - 1
         version: "3.1"
+  version_requirements: *id001
+  name: rails
   prerelease: false
   type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
   name: bluecloth
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id003
+  name: bb-ruby
   prerelease: false
   type: :runtime
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,28 +72,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id004
+  name: shoulda
   prerelease: false
   type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
+  version_requirements: *id005
+  name: bundler
   prerelease: false
   type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +102,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  version_requirements: *id006
+  name: jeweler
   prerelease: false
   type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,9 +116,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id007
+  name: rcov
   prerelease: false
   type: :development
-  requirement: *id006
 description: Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline
 email: jeff@assignr.com
 executables: []
@@ -124,6 +137,21 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/assets/images/sets/bbcode/bold.png
+- app/assets/images/sets/bbcode/clean.png
+- app/assets/images/sets/bbcode/code.png
+- app/assets/images/sets/bbcode/colors.png
+- app/assets/images/sets/bbcode/fonts.png
+- app/assets/images/sets/bbcode/italic.png
+- app/assets/images/sets/bbcode/link.png
+- app/assets/images/sets/bbcode/list-bullet.png
+- app/assets/images/sets/bbcode/list-item.png
+- app/assets/images/sets/bbcode/list-numeric.png
+- app/assets/images/sets/bbcode/picture.png
+- app/assets/images/sets/bbcode/preview.png
+- app/assets/images/sets/bbcode/quotes.png
+- app/assets/images/sets/bbcode/stroke.png
+- app/assets/images/sets/bbcode/underline.png
 - app/assets/images/sets/default/bold.png
 - app/assets/images/sets/default/clean.png
 - app/assets/images/sets/default/image.png
@@ -166,14 +194,17 @@ files:
 - app/assets/images/skins/simple/menu.png
 - app/assets/images/skins/simple/submenu.png
 - app/assets/javascripts/jquery.markitup.js
+- app/assets/javascripts/sets/bbcode/set.js
 - app/assets/javascripts/sets/default/set.js
 - app/assets/javascripts/sets/markdown/set.js
+- app/assets/stylesheets/sets/bbcode/style.css.scss
 - app/assets/stylesheets/sets/default/style.css.scss
 - app/assets/stylesheets/sets/markdown/style.css.scss
 - app/assets/stylesheets/skins/markitup/style.css.scss
 - app/assets/stylesheets/skins/simple/style.css.scss
 - app/assets/stylesheets/templates/preview.css
 - app/controllers/markitup/parsers_controller.rb
+- app/views/markitup/parsers/bbcode.html.erb
 - app/views/markitup/parsers/markdown.html.erb
 - config/routes.rb
 - lib/engine.rb
@@ -181,7 +212,6 @@ files:
 - markitup_rails.gemspec
 - test/helper.rb
 - test/test_markitup_rails.rb
-has_rdoc: true
 homepage: http://github.com/jwigal/markitup_rails
 licenses: 
 - MIT
@@ -211,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 engine that allows you to integrate the markItUp editor into the asset pipeline