bbcoder 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecc0ce999076a868e4dec52ade4e9029e8157691
+  data.tar.gz: 979b7907d53a0e7d99e53c6c6a474d86e4846b99
+SHA512:
+  metadata.gz: dbb36720136b6e1efda20ed2db5cde4ad4a876a6e3e47e57ad73eb5677cf047dcc7f93ccb37a114dd33eab08dbd683b01f509de7a178ff76613cb49cee6b4026
+  data.tar.gz: 1631b9da9ca17bcb71bd4a0f13a7ed9b71b5880b4a627f6652635f1c0e850e2b3443a7aaffa7d004b344ae36f9c6b7dccd31bf5a53bd11f91dc24736b197ec0b

data/README.md

@@ -1,7 +1,6 @@
 Status
 --------
-I consider bbcoder to be stable so you won't see many updates to it in the future.  It is perfectly fine to use in prodution.  The gem itself is pretty simple so it should work across
-the board with newer frameworks etc.  If you find any issues or think it needs a feature please submit an issue.
+I consider bbcoder to be stable so you won't see many updates to it in the future.  It is perfectly fine to use in production.  The gem itself is pretty simple so it should work across the board with newer frameworks etc.  If you find any issues or think it needs a feature please submit an issue.
 
 
 Features

data/lib/bbcoder/base.rb

@@ -18,6 +18,15 @@ class BBCoder
   end
 
   def parse
+    _parse
+    buffer.join
+  end
+
+  def buffer
+    @buffer ||= BBCoder::Buffer.new
+  end
+
+  def _parse
     raw.each do |data|
       case data
       when /\[\/([^\]]+)\]/
@@ -28,12 +37,5 @@ class BBCoder
         buffer.push(data) # content
       end
     end
-
-    buffer.join
-  end
-
-  def buffer
-    @buffer ||= BBCoder::Buffer.new
-  end
+  end # _parse
 end
-

data/lib/bbcoder/buffer_tags.rb

@@ -26,13 +26,17 @@ class BBCoder
 
     # logic when popping specific tag
     def pop(original_tag)
-      tag = original_tag.downcase.to_sym
+      tag = if original_tag.is_a?(Symbol)
+              original_tag
+            else
+              original_tag.downcase.to_sym
+            end
 
       # no more tags left to pop || this tag isn't in the list
       if empty? || !include?(tag)
         buffer.push("[/#{original_tag}]")
       elsif last == tag
-        buffer.push(BBCoder::Tag.to_html(_internal.pop, _meta.delete(size+1), buffer.pop(+1)))
+        buffer.push(BBCoder::Tag.to_html(_internal.pop, buffer.depth, _meta.delete(size+1), buffer.pop(+1)))
       elsif include?(tag)
         # repeats pop(tag) until we reach the last == tag
         buffer.push(join(+1))
@@ -46,7 +50,7 @@ class BBCoder
 
       1.upto(limit).to_a.collect do
         # singular tags are caught in the handle method
-        [BBCoder::Tag.handle(_internal.pop, _meta.delete(size+1)), buffer.pop(+1)].join  # +1 depth modifier for the buffer
+        [BBCoder::Tag.handle(_internal.pop, buffer.depth, _meta.delete(size+1)), buffer.pop(+1)].join  # +1 depth modifier for the buffer
       end.reverse.join
     end
 

data/lib/bbcoder/configuration.rb

@@ -1,29 +1,25 @@
 class BBCoder
   class Configuration
-    @@tags = {}
+    attr_accessor :tags
+
+    def initialize
+      @tags = {}
+    end
 
     def [](value)
-      @@tags[value]
+      @tags[value]
     end
 
     def clear
-      @@tags = {}
+      @tags = {}
     end
 
     def remove name
-      @@tags.delete(name.to_sym)
+      @tags.delete(name.to_sym)
     end
 
     def tag(name, options = {}, &block)
-      unless block.nil?
-        block.binding.eval <<-EOS
-          def meta; @meta; end
-          def content; @content; end
-          def singular?; @singularity; end
-        EOS
-      end
-      @@tags[name.to_sym] = BBCoder::Tag.new(name.to_sym, options.merge(:block => block))
+      @tags[name.to_sym] = BBCoder::Tag.new(name.to_sym, options.merge(:block => block))
     end
   end
 end
-

data/lib/bbcoder/tag.rb

@@ -7,7 +7,7 @@ class BBCoder
       @options = options.merge(:as => (options[:as] || name), :singular => (options[:singular] || false))
     end
 
-    def to_html(meta, content, singularity = false)
+    def to_html(depth, meta, content, singularity = false)
       unless content_valid?(content, singularity) && meta_valid?(meta, singularity) && link_valid?(meta, content)
         return self.class.reform(name, meta, content, singularity, true)
       end
@@ -16,9 +16,14 @@ class BBCoder
         "<#{options[:as]}>#{content}</#{options[:as]}>"
       else
         options[:block].binding.eval <<-EOS
+          @depth = #{depth}
           @meta = %Q{#{Regexp.escape(meta.to_s)}}
           @content = %Q{#{Regexp.escape(content.to_s)}}
           @singularity = #{singularity.to_s}
+          def depth; @depth; end
+          def meta; @meta; end
+          def content; @content; end
+          def singular?; @singularity; end
         EOS
         options[:block].call
       end
@@ -75,16 +80,17 @@ class BBCoder
     end
 
     module ClassMethods
-      def to_html(tag, meta, content, singularity = false)
-        BBCoder.configuration[tag].to_html(meta, content, singularity)
+      def to_html(tag, depth, meta, content, singularity = false)
+        BBCoder.configuration[tag].to_html(depth, meta, content, singularity)
       end
 
       # need #handle so we don't get into a reform loop from to_html
       # checking content validity
-      def handle(tag, meta, content = nil, force_end = false)
+      def handle(tag, depth, meta, content = nil, force_end = false)
         if BBCoder.configuration[tag] && BBCoder.configuration[tag].singular?
-          to_html(tag, meta, content, true)
+          to_html(tag, depth, meta, content, true)
         else
+          # reform doesn't really care about depth, so we don't pass it in.
           reform(tag, meta, content, force_end)
         end
       end

data/lib/bbcoder/version.rb

@@ -1,3 +1,3 @@
 class BBCoder
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/base_spec.rb

@@ -6,11 +6,11 @@ describe BBCoder do
 
   context "#configuration" do
     before do
-      @tags = BBCoder::Configuration.class_variable_get(:@@tags).clone
+      @tags = BBCoder.configuration.tags.clone
     end
 
     after do
-      BBCoder::Configuration.class_variable_set(:@@tags, @tags)
+      BBCoder.configuration.tags = @tags
     end
 
     it "should return the same object for multiple calls" do
@@ -31,11 +31,11 @@ describe BBCoder do
 
   context "#configure" do
     before do
-      @tags = BBCoder::Configuration.class_variable_get(:@@tags).clone
+      @tags = BBCoder.configuration.tags.clone
     end
 
     after do
-      BBCoder::Configuration.class_variable_set(:@@tags, @tags)
+      BBCoder.configuration.tags = @tags
     end
 
     it "should fail without a block" do
@@ -44,8 +44,9 @@ describe BBCoder do
 
     it "should instance_eval the block onto configuration" do
       block = Proc.new { tag :p }
-      mock(BBCoder).configuration.stub!.instance_eval(&block)
       BBCoder.configure(&block)
+
+      BBCoder.configuration.tags[:p].should_not be_nil
     end
 
     it "should be able to remove a tag" do
@@ -75,4 +76,3 @@ describe BBCoder do
     end
   end
 end
-

data/spec/bbcoder_spec.rb

@@ -175,7 +175,7 @@ EOS
 
     it "should handle an img tag match for meta" do
       "[img=image.exe]".bbcode_to_html.should == "[img=image.exe]"
-    end
+p    end
   end
 
   context "with xss attacks" do
@@ -219,4 +219,3 @@ S
     end
   end
 end
-

data/spec/tag_spec.rb

@@ -87,5 +87,20 @@ describe BBCoder::Tag do
       end
     end
   end # #content_valid?
-end
 
+
+
+  #
+  # Test our depth logic and verify we are binding the variable:
+  # TODO
+  #
+  context "with depths" do
+    before do
+      @depth = BBCoder::Tag.new("strong", :block => proc { "<strong>depth: #{depth} - #{content}</strong>" })
+    end
+
+    it "should allow blocks to use depth as a binded variable" do
+      @depth.to_html(0, nil, "test", false).should == "<strong>depth: 0 - test</strong>"
+    end
+  end # context "with depths"
+end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bbcoder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for parsing bbcode that doesn't rely on regular expressions
@@ -66,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .rspec
+- ".gemtest"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -90,27 +83,26 @@ files:
 - spec/tag_spec.rb
 homepage: http://github.com/asceth/bbcoder
 licenses: []
+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: bbcoder
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BBCode parser
 test_files:
 - spec/base_spec.rb