bb-ruby 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzBkYjZmZTMzM2RmOWIwODBlNjlhZjdkOWRhMzc3M2I1MTM0ZDIwZg==
+  data.tar.gz: !binary |-
+    MThhM2Y4ODRhMjZjNTNiMzFjZmI5YzgyOTllZGY3YzEwOTQ1NzA1OQ==
+SHA512:
+  metadata.gz: !binary |-
+    Njc2ZDcxNzVlY2I5NTZlOTk0MzM2ZWJlM2IyM2E2ZDlhNjA2MDUwNmRkNjk1
+    M2NiMjg1NDg5ODEwNzc3OGQwOTkwZjNkMzViZjJiOTIwNDQ2NmRjYzE3OTQ3
+    YjBhNTZjMjcxMWExNWY1YWFhNTY3YjE1YzUzMjMzZTkzOTIxNGE=
+  data.tar.gz: !binary |-
+    NTE3NWJlMmQyYzM1NzQ3Y2YxMGEwMTVhOTNjOWU4OTUzOTVmOTAzODVmZGRk
+    Mjk3YzkyOTlmZTg5MjRjOTVkNzBkODYyMWUzMTk5MTgyOTYxMGZlNzM1Yzhi
+    YTE0NmQ2MjI1Y2MyZmM5MmFjNDRkN2ZiYzg2YjI3NmUxMGQ3Mzc=

data/.gitignore

@@ -8,3 +8,4 @@ config
 script
 .DS_Store
 *.gem
+vendor/

data/{History.txt → CHANGELOG}

@@ -1,3 +1,7 @@
+== 1.0.3 2013-10-18
+
+* Fix but with auto-detection of links without protocol
+
 == 1.0.2 2013-10-08
 
 * Add MIT license information

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    bb-ruby (1.0)
+    bb-ruby (1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.0.3)
+    rake (10.1.0)
 
 PLATFORMS
   ruby

data/{License.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008 Craig P Jolicoeur
+Copyright (c) 2008 Craig P Jolicoeur, Fernando Blat
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -0,0 +1,108 @@
+# BBRuby
+
+* [http://rubygems.org/gems/bb-ruby](http://rubygems.org/gems/bb-ruby) [![Build Status](https://travis-ci.org/cpjolicoeur/bb-ruby.png?branch=master)](https://travis-ci.org/cpjolicoeur/bb-ruby)
+
+## Description:
+
+BBRuby is a [BBCode](http://www.bbcode.org) implementation for Ruby. It will convert strings with BBCode markup to their HTML equivalent.
+
+## Installation:
+
+    gem install bb-ruby
+
+
+## Usage:
+
+    require 'bb-ruby'
+
+BBRuby has been included directly into the String class for use on any string object:
+
+    text = "[b]Here is some bold text[/b] followed by some [u]underlined text[/u]"
+    output = text.bbcode_to_html
+    text.bbcode_to_html!
+
+BBRuby will auto-escape HTML tags.  To prevent this just pass false as the second param:
+
+    output = text.bbcode_to_html({}, false)
+
+Only allow certain tags:
+
+    output = text.bbcode_to_html({}, true, :enable, :image, :bold, :quote)
+
+Disable certain tags:
+
+    output = text.bbcode_to_html({}, true, :disable, :image, :bold, :quote)
+
+Alternative Direct usage:
+
+    output = BBRuby.to_html(bbcode_markup)
+
+Define your own translation, in order to be more flexible:
+
+    my_blockquote = {
+      'Quote' => [
+        /\[quote(:.*)?=(.*?)\](.*?)\[\/quote\1?\]/mi,
+        '<div class="quote"><p><cite>\2</cite></p><blockquote>\3</blockquote></div>',
+        'Quote with citation',
+        '[quote=mike]please quote me[/quote]',
+        :quote
+      ],
+    }
+
+    text.bbcode_to_html(my_blockquote)
+
+Define Proc as replacement:
+
+    module BBRuby
+      @@tags = @@tags.merge({
+          'File' => [
+            /\[file(:.*)?=(.*?)\](.*?)\[\/file\1?\]/mi,
+            lambda{ |e| "<div class="file"><p><cite>#{e[3]}</cite></p><blockquote>#{file_read_method(e[2])}</blockquote></div>"},
+            'File content with citation',
+            '[file=script.rb]Script Caption[/file]',
+            :file
+          ],
+        })
+    end
+
+You can also use the simple_format method of ActionPack by using the *_with_formatting methods:
+
+    output = text.bbcode_to_html_with_formatting
+    output = text.bbcode_to_html_with_formatting!
+
+
+### TAGS PROCESSED:
+
+The following is the list of BBCode tags processed by BBRuby and their associated symbol for enabling/disabling them
+
+    [b]               :bold
+    [i]               :italics
+    [u]               :underline
+    [s]               :strikeout
+    [del]             :delete
+    [ins]             :insert
+    [code]            :code
+    [size]            :size
+    [color]           :color
+    [ol]              :orderedlist
+    [ul]              :unorderedlist
+    [li]              :listitem
+    [*]               :listitem
+    [list]            :listitem
+    [list=1]          :listitem
+    [list=a]          :listitem
+    [dl]              :definelist
+    [dt]              :defineterm
+    [dd]              :definition
+    [quote]           :quote
+    [quote=source]    :quote
+    [url=link]        :link
+    [url]             :link
+    [img size=]       :image
+    [img=]            :image
+    [img]             :image
+    [youtube]         :video
+    [gvideo]          :video
+    [vimeo]           :video
+    [email]           :email
+    [align]           :align

data/lib/bb-ruby.rb

@@ -1,5 +1,3 @@
-require "bb-ruby/version"
-
 module BBRuby
   # allowable image formats
   @@imageformats = 'png|bmp|jpg|gif|jpeg'
@@ -147,11 +145,17 @@ module BBRuby
       "Maybe try looking on [url]http://google.com[/url]",
       :link],
     'Link (Automatic)' => [
-      /(\A|\s)((https?:\/\/|www\.)[^\s<]+)/,
+      /(\A|\s)(https?:\/\/[^\s<]+)/,
       ' <a href="\2">\2</a>',
       'Hyperlink (automatic)',
       'Maybe try looking on http://www.google.com',
       :link],
+    'Link (Automatic without leading http(s))' => [
+      /(\A|\s)(www\.[^\s<]+)/,
+      ' <a href="http://\2">\2</a>',
+      'Hyperlink (automatic without leading http(s))',
+      'Maybe try looking on www.google.com',
+      :link],
     'Image (Resized)' => [
       /\[img(:.+)? size=#{@@quote_matcher}(\d+)x(\d+)\2\](.*?)\[\/img\1?\]/im,
       '<img src="\5" style="width: \3px; height: \4px;" />',

data/lib/bb-ruby/version.rb

@@ -1,3 +1,3 @@
 module BBRuby
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/bb-ruby_test.rb

@@ -168,6 +168,11 @@ class TestBBRuby < Test::Unit::TestCase
     assert_equal %Q(Try using google <a href="http://google.com">http://google.com</a>), 'Try using google http://google.com'.bbcode_to_html
     assert_equal %Q(Try using googlehttp://google.com), 'Try using googlehttp://google.com'.bbcode_to_html
     assert_equal %Q( <a href="http://google.com">http://google.com</a>), 'http://google.com'.bbcode_to_html
+    # links without leading http(s)
+    assert_equal %Q(previous text <a href="http://www.google.com">www.google.com</a> post text), 'previous text www.google.com post text'.bbcode_to_html
+    assert_equal %Q(Try using google <a href="http://www.google.com">www.google.com</a>), 'Try using google www.google.com'.bbcode_to_html
+    assert_equal %Q(Try using googlewww.google.com), 'Try using googlewww.google.com'.bbcode_to_html
+    assert_equal %Q( <a href="http://www.google.com">www.google.com</a>), 'www.google.com'.bbcode_to_html
   end
 
   def test_html_escaping
@@ -212,7 +217,7 @@ class TestBBRuby < Test::Unit::TestCase
   end
 
   def test_self_tag_list
-    assert_equal 33, BBRuby.tag_list.size
+    assert_equal 34, BBRuby.tag_list.size
   end
 
   def test_redefinition_of_tag_html

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bb-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Craig P. Jolicoeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies: []
 description: BBCode for Ruby
 email:
@@ -20,11 +19,11 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
-- History.txt
-- License.txt
-- README.rdoc
+- LICENSE
+- README.md
 - Rakefile
 - bb-ruby.gemspec
 - lib/bb-ruby.rb
@@ -34,27 +33,26 @@ files:
 homepage: http://cpjolicoeur.github.io/bb-ruby/
 licenses:
 - MIT
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BBRuby is a BBCode implementation for Ruby. It will convert strings with
   BBCode markup to their HTML equivalent
 test_files:

data/README.rdoc

@@ -1,134 +0,0 @@
-= BBRuby
-
-* http://bb-ruby.rubyforge.org
-
-== DESCRIPTION:
-
-BBRuby is a BBCode (http://www.bbcode.org) implementation for Ruby. It will convert strings with BBCode markup to their HTML equivalent.
-
-== INSTALL:
-
-To install as a gem:
-
-  sudo gem install bb-ruby
-  
-To install as a plugin:
-  
-  ./script/plugin install git://github.com/cpjolicoeur/bb-ruby.git
-
-== USAGE:
-
-  require 'bb-ruby' # (only needed if installed as a gem)
-
-BBRuby has been included directly into the String class for use on any string object:
-
-  text = "[b]Here is some bold text[/b] followed by some [u]underlined text[/u]"
-  output = text.bbcode_to_html
-  text.bbcode_to_html!
-
-BBRuby will auto-escape HTML tags.  To prevent this just pass false as the second param:
-
-  output = text.bbcode_to_html({}, false)
-
-Only allow certain tags:
-
-  output = text.bbcode_to_html({}, true, :enable, :image, :bold, :quote)
-
-Disable certain tags:
-
-  output = text.bbcode_to_html({}, true, :disable, :image, :bold, :quote)
-
-Alternative Direct usage:
-
-  output = BBRuby.to_html(bbcode_markup)
-
-Define your own translation, in order to be more flexible:
-
-    my_blockquote = {
-      'Quote' => [
-        /\[quote(:.*)?=(.*?)\](.*?)\[\/quote\1?\]/mi,
-        '<div class="quote"><p><cite>\2</cite></p><blockquote>\3</blockquote></div>',
-        'Quote with citation',
-        '[quote=mike]please quote me[/quote]',
-        :quote
-      ],      
-    }
- 
-    text.bbcode_to_html(my_blockquote)
-
-Define Proc as replacement:
-
-    module BBRuby
-      @@tags = @@tags.merge({
-          'File' => [
-            /\[file(:.*)?=(.*?)\](.*?)\[\/file\1?\]/mi,
-            lambda{ |e| "<div class="file"><p><cite>#{e[3]}</cite></p><blockquote>#{file_read_method(e[2])}</blockquote></div>"},
-            'File content with citation',
-            '[file=script.rb]Script Caption[/file]',
-            :file
-          ],
-        })
-    end
-    
-You can also use the simple_format method of ActionPack by using the *_with_formatting methods:
-
-  output = text.bbcode_to_html_with_formatting
-  output = text.bbcode_to_html_with_formatting!
-
-
-== TAGS PROCESSED:
-
-The following is the list of BBCode tags processed by BBRuby and their associated symbol for enabling/disabling them
-
-* [b]               :bold
-* [i]               :italics
-* [u]               :underline
-* [s]               :strikeout 
-* [del]             :delete
-* [ins]             :insert
-* [code]            :code
-* [size]            :size
-* [color]           :color
-* [ol]              :orderedlist
-* [ul]              :unorderedlist
-* [li]              :listitem    
-* [*]               :listitem
-* [list]            :listitem
-* [list=1]          :listitem
-* [list=a]          :listitem
-* [dl]              :definelist
-* [dt]              :defineterm
-* [dd]              :definition
-* [quote]           :quote
-* [quote=source]    :quote
-* [url=link]        :link
-* [url]             :link
-* [img size=]       :image
-* [img=]            :image
-* [img]             :image
-* [youtube]         :video
-* [gvideo]         :video
-* [vimeo]           :video
-* [email]           :email
-
-== LICENSE:
-
-Copyright (c) 2008 Craig P Jolicoeur, Fernando Blat
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.