bbcode-rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85c25fceeb4fbc1b4c93491384ef5af2d867587d
-  data.tar.gz: 23873eb57b191664b7b6afd60e6590841e888d2d
+  metadata.gz: 6e3a03c9829b29ae970341a6869350c6d81a63e6
+  data.tar.gz: 1075e5565218f39b55b224764911b19b419f30da
 SHA512:
-  metadata.gz: 12894618783176fcb4053053aac63ebc69e3a6d81de7208d060cd6aa14253b5817378de929cc025f96f9255595ab6b6fae2188d846e99356507a898d4f4d2412
-  data.tar.gz: ee74932ca1193c89a6cc4898696f390134975376b475241c459cc9b3c76b0d3f61793588a8493ab5cc20e20261bdcb92b65538699493c73977c8f107e2cce326
+  metadata.gz: 0a8313ca29126829b91a2338647b00adf318223ef4de44f7649dba819198070b5045ec211cf977094aa8024da3bf2b1bbfe66c24ae4dbcf1e28ad8d9a4cdfcde
+  data.tar.gz: f5cc8b2ae3c5dcc509c8275599b8d4c1a366c7b6a476773f300492fd1137a7860801b43e0d43ebb172ac5cf2d4138d9b48335ec660bece20045cef174f6ccdc7

data/README.md

@@ -55,7 +55,7 @@ This will create `app/bbcode/user_tag.rb`.
 #app/bbcode/user.rb
 
 class UserTag < BBCode::Tag
-    name :user
+    block_name :user
     on_layout do |args|
         "TODO: Implement user tag"
     end
@@ -68,7 +68,7 @@ You could now add something like:
 #app/bbcode/user.rb
 
 class UserTag < BBCode::Tag
-    name :user, :argument, :no_closing_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 }
@@ -78,6 +78,16 @@ end
 
 Of course, the limitations are your knowledge in ruby and rails :)
 
+### Transforming a BBCode string into HTML
+
+Just call `bbcode_to_html` on any string.
+
+```ruby
+#> User.all.first.bio
+"[i]Hello [b]Everyone[/b][/i]"
+#> User.all.first.bio.bbcode_to_html
+=> "<em>Hello <strong>Everyone</strong></em>"
+```
 
 ## Contributing
 

data/lib/bbcode-rails.rb

@@ -1,12 +1,25 @@
 require "bbcode-rails/version"
 
 module BBCode
-  @@tags = []
+  class ParseError < StandardError
+  end
+
+  @tags = {}
   def self.tags
-    @@tags
+    @tags
+  end
+
+  def self.get_tag_by_name name
+    if defined?(Rails) && Rails.env.development?
+      begin
+        "#{p}_tag".camelize.constantize
+      rescue NameError
+      end
+    end
+    @tags["#{name.to_s.downcase}tag"]
   end
 
-  def self.parse str
+  def self.parse str, raise_error=false
     str = str.dup
 
     str.gsub!( '&', '&amp;' )
@@ -15,20 +28,140 @@ module BBCode
     str.gsub!( '"', '&quot;' )
     str.gsub!( "'", '&apos;' )
 
-    # For eager loading
-    if defined?(Rails) && Rails.env.development?
-      str.scan(/\[(\w+)(?:=.+)?\]/).each do |tagname|
-        begin
-          "#{tagname[0]}_tag".camelize.constantize
-        rescue NameError
+    # Let's iterate over the pieces to build a tree
+    # It works like this:
+    # For each object you have two things:
+    #   1. It is a tag name a la [img]
+    #   2. It is a simple string, something like 'Hello'
+    #
+    # Now, we want a tree that looks like this
+    #
+    # -> |
+    #    | ImgTag src: http://adada
+    #    | String This cat
+    #    | BTag is -> |
+    #                 | ITag funny!
+    # In the end we just recursively append
+
+    result = []
+
+    tag_open          = /\[/
+    tag_close         = /\]/
+    tag_close_prefix  = /\//
+    tag_arg           = /=/
+    tag_arg_delim     = /&quot;/
+    tag_name          = /[-_a-z0-9]/
+
+    current_state = :text
+    current_tag = result
+
+    begin
+      pos = 0
+      while pos < str.length
+        case current_state
+        when :text
+          tmp = ""
+          # We iterate through the string either until the end or if we find a [
+          while not str[pos] =~ tag_open and pos < str.length
+            tmp << str[pos]
+            pos = pos.next
+          end
+          current_tag << tmp
+          current_state = :tag_name if pos < str.length # Okay, we have found the beginning of a possible tag!
+          pos = pos.next
+        when :tag_name
+          name = ""
+          if str[pos-1] =~ tag_open and str[pos] =~ tag_close_prefix
+            # It's a closing tag!
+            # Let's check if it applies to our current tag..
+
+            broke_out = false
+            tag = current_tag
+            until tag.is_a? Array
+              len = tag.name.length
+              if str[pos+1,len] == tag.name and str[pos+len+1] =~ tag_close
+                # If it's the current one?
+                if current_tag == tag
+                  current_tag = tag.parent
+                  pos += len+1
+                  broke_out = true
+                  break
+                else
+                  # It's not the current one! Invalid construct
+                  raise BBCode::ParseError, "Invalid nested tags"
+                end
+              end
+              tag = tag.parent
+            end
+
+            # It's not a closing tag we recognize, so it's text really!
+            # Let's restore this!
+            if not broke_out
+              current_tag << "[/"
+            end
+            current_state = :text
+            pos = pos.next
+            next
+          end
+          while not (str[pos] =~ tag_close and str[pos] =~ tag_arg and pos < str.length) and str[pos] =~ tag_name
+            name << str[pos]
+            pos = pos.next
+          end
+
+          if str[pos] =~ tag_arg or str[pos] =~ tag_close
+            if self.get_tag_by_name(name)
+              new_tag = self.get_tag_by_name(name).new(current_tag)
+              current_tag  << new_tag
+              if new_tag.has_option(:content) or new_tag.has_option(:argument)
+                current_tag = new_tag
+              end
+              if str[pos] =~ tag_arg
+                if new_tag.has_option :argument
+                  current_state = :tag_arg
+                else
+                  raise BBCode::ParseError
+                end
+              else
+                current_state = :text
+              end
+              pos = pos.next
+            else
+              current_tag << "[#{name}"
+              current_state = :text
+            end
+            next
+          end
+
+
+          # Did we hit the end? Let's get out
+          current_tag << name
+          current_state = :text
+        when :tag_arg
+          arg = ""
+          while not str[pos] =~ tag_close and pos < str.length
+            arg << str[pos]
+            pos = pos.next
+          end
+
+          current_tag.argument = arg.gsub(/^#{tag_arg_delim}(.*)#{tag_arg_delim}$/, '\1')
+          if not current_tag.has_option(:content)
+            current_tag = current_tag.parent
+          end
+          current_state = :text
+          pos = pos.next
+        else
+          pos = pos.next
         end
       end
-    end
 
-    @@tags.each do |t|
-      str.gsub!(t.regex) { t.instance.instance_exec($~, &t.block) }
+      result.map(&:to_s).join('').strip
+    rescue BBCode::ParseError => e
+      if raise_error
+        raise e
+      else
+        str
+      end
     end
-    str
   end
 
 end

data/lib/bbcode-rails/tag.rb

@@ -17,33 +17,73 @@ class BBCode::Tag
     self.view_paths = "app/views"
   end
 
-  def self.instance
-    @_tag ||= new
+  attr_accessor :parent
+
+  def initialize parent
+    @parent = parent
+    @content = []
+    @argument = ""
   end
 
-  def self.inherited subclass
-    # In case we autoreload, remove earlier instances
-    BBCode.tags.delete_if {|c| c.to_s == subclass.to_s }
-    BBCode.tags << subclass
+  def has_option opt
+    self.class.options.include?(opt)
+  end
+
+  def get_block
+    self.class.block
   end
 
-  def self.block_name n, *args
-    if args.include? :argument
-      arg = '=(?:&quot;)?(.+?)(?:&quot;)?'
+  def argument= arg
+    if !has_option :argument
+      raise BBCode::ParseError, "Tried to assign an argument to a tag which takes none, #{name}"
+    else
+      @argument = arg
     end
-    if args.include? :no_closing_tag
-      @regex = /\[#{n.to_s}#{arg}\]/mi
+  end
+
+  def << c
+    if !has_option :content
+      raise BBCode::ParseError, "Tried to assign content to a tag which takes none, #{name}"
     else
-      @regex = /\[#{n.to_s}#{arg}\](.+?)\[\/#{n.to_s}\]/mi
+      @content << c
+    end
+  end
+
+  def to_s
+    if has_option :content
+      result = @content.map(&:to_s).join('')
     end
+    if has_option(:content) and has_option(:argument)
+      get_block.call(@argument, result)
+    elsif has_option :content
+      get_block.call(result)
+    elsif has_option :argument
+      get_block.call(@argument)
+    else
+      get_block.call
+    end
+  end
+
+  def name
+    self.class.to_s.downcase.gsub(/tag$/i,'')
+  end
+
+  def self.inherited subclass
+    # In case we autoreload, remove earlier instances
+    BBCode.tags.delete_if {|c| c.to_s == subclass.to_s }
+    BBCode.tags[subclass.to_s.downcase] = subclass
+  end
+
+  def self.block_options *args
+    @options = args
   end
 
   def self.on_layout &b
     @block = b
   end
 
-  def self.regex
-    @regex
+  def self.options
+    @options ||= []
   end
 
   def self.block

data/lib/bbcode-rails/version.rb

@@ -1,3 +1,3 @@
 module BBCode
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

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