bbcode-rails 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109c94d320f0111ad525b254f3e99cd37fc7bf0a
-  data.tar.gz: ac7b790975f2600fb5aca83a3a9d156e141c5e04
+  metadata.gz: f2d33272d04f3a4dca99ee3945d33c30a8f6e7cf
+  data.tar.gz: a3dd428fe61086e512730366187aef2e2ceb9d5c
 SHA512:
-  metadata.gz: 13deaddccdc0de9f4a56b9343be41840e66c1615b2a0077a689c87d3ac4aa9431df3ac8c43e792118ce5dcd7e669326fee72c851fb12055f83fed10084210a90
-  data.tar.gz: 7cfd4b55921031d91b79c292d77a1fd21d0fbf8a78bbf45bd6e4d5e4ba6aab42c2b30b5ad6d2447da7ad0c9fea2770d4d4cf0527b141a12448afecdf3cc11452
+  metadata.gz: 9f1b88ae515b2761320aea8bae8ec1d440520ffb82095e069a264bced7e5cb6257fa58bf62995aecc97c60ab80a3e0803e5e0849be2d940b489950a8e27700f6
+  data.tar.gz: 051b5b5df34e0627efb45816b22d502e7887098b903cd7cda41a456b2fddcaacebf60966a420c8b0677455004cccb9097db0a8f084b96e3df3d1f6fab5539037

data/README.md

@@ -55,10 +55,16 @@ This will create `app/bbcode/user_tag.rb`.
 #app/bbcode/user.rb
 
 class UserTag < BBCode::Tag
-    block_name :user
-    on_layout do |args|
-        "TODO: Implement user tag"
-    end
+  # If your block uses an argument or can have content add the following line
+  # with your needed option
+  # block_options :argument, :content
+
+  # Be sure to put in only the arguments that you need.
+  # So if you only take an argument, remove contents, same the other way around.
+  # However if you have both, they have to be in the order of `arg, contents`
+  on_layout do |arg, contents|
+    "TODO: Implement user tag"
+  end
 end
 ```
 
@@ -68,11 +74,14 @@ You could now add something like:
 #app/bbcode/user.rb
 
 class UserTag < BBCode::Tag
-    block_name :user, :argument, :no_closing_tag
-    on_layout do |args|
-        user = User.find_by_id(args[1])
-        render partial: 'shared/userquote', locals: { user: user }
-    end
+  # If your block uses an argument or can have content add the following line
+  # with your needed option
+  # block_options :argument, :content
+  block_options :argument
+  on_layout do |arg|
+    user = User.find_by_id(arg)
+    render partial: 'shared/userquote', locals: { user: user }
+  end
 end
 ```
 

data/lib/bbcode-rails.rb

@@ -22,11 +22,16 @@ module BBCode
   def self.parse str, raise_error=false
     str = str.dup
 
-    str.gsub!( '&', '&' )
-    str.gsub!( '<', '&lt;' )
-    str.gsub!( '>', '&gt;' )
-    str.gsub!( '"', '&quot;' )
-    str.gsub!( "'", '&apos;' )
+    str.gsub!('&', '&amp;')
+    str.gsub!('<', '&lt;')
+    str.gsub!('>', '&gt;')
+    str.gsub!('"', '&quot;')
+    str.gsub!("'", '&apos;')
+
+    # Taken from bb-ruby, who took it from Rails Actionpack
+    str.gsub!(/\r\n?/, "\n") # \r\n and \r => \n
+    str.gsub!(/\n/, '<br>')  # 1 newline   => br
+
 
     # Let's iterate over the pieces to build a tree
     # It works like this:

data/lib/bbcode-rails/version.rb

@@ -1,3 +1,3 @@
 module BBCode
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/lib/generators/bb_code/templates/b_tag.rb

@@ -1,8 +1,8 @@
 class BTag < BBCode::Tag
-  block_name :b
+  block_options :content
 
-  on_layout do |args|
-    "<strong>#{args[1]}</strong>"
+  on_layout do |contents|
+    "<strong>#{contents}</strong>"
   end
 end
 

data/lib/generators/bb_code/templates/i_tag.rb

@@ -1,8 +1,8 @@
 class ITag < BBCode::Tag
-  block_name :i
+  block_options :content
 
-  on_layout do |args|
-    "<em>#{args[1]}</em>"
+  on_layout do |contents|
+    "<em>#{contents}</em>"
   end
 end
 

data/lib/generators/bb_code/templates/img_tag.rb

@@ -1,8 +1,8 @@
 class ImgTag < BBCode::Tag
-  block_name :img, :argument, :no_closing_tag
+  block_options :argument
 
-  on_layout do |args|
-    args[1].gsub!(/javascript:/, '')
-    "<img src='#{args[1]}'>"
+  on_layout do |arg|
+    args[1].gsub!(/^javascript:/, '')
+    "<img src='#{arg}'>"
   end
 end

data/lib/generators/bb_code/templates/quote_tag.rb

@@ -1,8 +1,8 @@
 class QuoteTag < BBCode::Tag
-  block_name :quote, :argument
+  block_options :argument, :content
 
-  on_layout do |args|
-    user = User.find_by_id(args[1])
-    render(partial: 'bbcode/quote', locals: { user: user, message: args[2], user_name: args[1] })
+  on_layout do |arg, contents|
+    user = User.find_by_id(arg)
+    render(partial: 'bbcode/quote', locals: { user: user, message: contents, user_name: arg })
   end
 end

data/lib/generators/bb_code/templates/tag.rb

@@ -1,8 +1,13 @@
 <% module_namespacing do -%>
 class <%= name.classify %>Tag < BBCode::Tag
-  block_name :<%= name %>
+  # If your block uses an argument or can have content add the following line
+  # with your needed option
+  # block_options :argument, :content
 
-  on_layout do |args|
+  # Be sure to put in only the arguments that you need.
+  # So if you only take an argument, remove contents, same the other way around.
+  # However if you have both, they have to be in the order of `arg, contents`
+  on_layout do |arg, contents|
     "TODO: Implement <%= name %> tag"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbcode-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Marcel Müller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler