bbcoder 0.2.0 → 1.0.0

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    bbcoder (0.1.6)
+    bbcoder (1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rr (1.0.2)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    diff-lcs (1.1.3)
+    rr (1.0.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -41,8 +41,8 @@ Configuration Examples
       tag :ol
       tag :li, :parents => [:ol, :ul]
 
-      tag :img, :match => /^.*(png|bmp|jpg|gif)$/ do
-        %(<a href="#{content}"><img src="#{content}" /></a>)
+      tag :img, :match => /^.*(png|bmp|jpe?g|gif)$/ do
+        %(<a href="#{singular? ? meta : content}"><img src="#{singular? ? meta : content}" /></a>)
       end
 
       tag :code do
@@ -66,7 +66,9 @@ Configuration Examples
 Options for #tag
 
 * :as (symbol) -> use this as the html element ([b] becomes strong)
-* :match (regex) -> convert this tag and its content to html only if the content matches the regex
+* :match (regex) -> convert this tag and its content to html only if the content and meta matches the regex (see img tag above for example)
+* :match_meta (regex) -> same as :match except only for meta
+* :match_content (regex) -> same as :match except only for content
 * :parents ([symbol]) -> ignore this tag if there is no open tag that matches its parents
 * :singular (true|false) -> use this if the tag does not require an ending tag
 

data/lib/bbcoder/tag.rb

@@ -8,7 +8,7 @@ class BBCoder
     end
 
     def to_html(meta, content, singularity = false)
-      return self.class.reform(name, meta, content, true) unless content_valid?(content)
+      return self.class.reform(name, meta, content, singularity, true) unless content_valid?(content, singularity) && meta_valid?(meta, singularity)
 
       if options[:block].nil?
         "<#{options[:as]}>#{content}</#{options[:as]}>"
@@ -22,12 +22,33 @@ class BBCoder
       end
     end
 
-    def content_valid?(content)
-      return true if content.nil? && options[:singular]
+    def meta_valid?(meta, singularity)
+      return true if meta.nil?
+
+      unless options[:match].nil?
+        return false if meta.match(options[:match]).nil?
+      end
+
+      unless options[:match_meta].nil?
+        return false if meta.match(options[:match_meta]).nil?
+      end
+
+      return true
+    end
+
+    def content_valid?(content, singularity)
+      return true if content.nil? && (options[:singular] && singularity)
       return false if content.nil?
-      return true if options[:match].nil?
 
-      return !content.match(options[:match]).nil?
+      unless options[:match].nil?
+        return false if content.match(options[:match]).nil?
+      end
+
+      unless options[:match_content].nil?
+        return false if content.match(options[:match_content]).nil?
+      end
+
+      return true
     end
 
     def parents
@@ -53,8 +74,8 @@ class BBCoder
         end
       end
 
-      def reform(tag, meta, content = nil, force_end = false)
-        if content.nil? && !force_end
+      def reform(tag, meta, content = nil, singularity = false, force_end = false)
+        if (content.nil? && !force_end) || singularity
           %(#{reform_open(tag, meta)})
         else
           %(#{reform_open(tag, meta)}#{content}#{reform_end(tag)})

data/lib/bbcoder/version.rb

@@ -1,3 +1,3 @@
 class BBCoder
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/lib/bbcoder.rb

@@ -56,8 +56,8 @@ BBCoder.configure do
     end
   end
 
-  tag :img, :match => /^.*(png|bmp|jpg|gif)$/ do
-    %(<a href="#{content}"><img src="#{content}" /></a>)
+  tag :img, :match => /^.*(png|bmp|jpe?g|gif)$/, :singular => true do
+    %(<a href="#{singular? ? meta : content}"><img src="#{singular? ? meta : content}" /></a>)
   end
 
   tag :youtube do

data/spec/bbcoder_spec.rb

@@ -136,6 +136,20 @@ EOS
     it "should handle singular tags in non singular form" do
       "[p]I [sub]me[/sub] think [sub]thought[/sub]; therefore [sup]well[/sup] I am[/p]".bbcode_to_html.should == "<p>I <sub>me</sub> think <sub>thought</sub>; therefore <sup>well</sup> I am</p>"
     end
+
+    it "should handle incorrect singular tags" do
+      "[img=image.exe]".bbcode_to_html.should == "[img=image.exe]"
+    end
+  end
+
+  context "with bad matches" do
+    it "should handle an img tag match for content" do
+      "[img]image.exe[/img]".bbcode_to_html.should == "[img]image.exe[/img]"
+    end
+
+    it "should handle an img tag match for meta" do
+      "[img=image.exe]".bbcode_to_html.should == "[img=image.exe]"
+    end
   end
 end
 

data/spec/tag_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe BBCoder::Tag do
+
+  context "#meta_valid?" do
+    context "with match_meta" do
+      before do
+        @tag = BBCoder::Tag.new("img", :match_meta => /^.*(png|bmp|jpg|gif)$/)
+      end
+
+      it "should return false when tag meta is invalid" do
+        @tag.meta_valid?("image.exe", false).should == false
+      end
+
+      it "should return true when tag meta is valid" do
+        @tag.meta_valid?("image.png", false).should == true
+      end
+
+      it "should return true when tag meta is nil" do
+        @tag.meta_valid?(nil, false).should == true
+      end
+    end
+
+    context "with match" do
+      before do
+        @tag = BBCoder::Tag.new("img", :match => /^.*(png|bmp|jpg|gif)$/)
+      end
+
+      it "should return false when tag meta is invalid" do
+        @tag.meta_valid?("image.exe", false).should == false
+      end
+
+      it "should return true when tag meta is valid" do
+        @tag.meta_valid?("image.png", false).should == true
+      end
+
+      it "should return true when tag meta is nil" do
+        @tag.meta_valid?(nil, false).should == true
+      end
+    end
+  end # #meta_valid?
+
+  context "#content_valid?" do
+    context "with match_content" do
+      before do
+        @tag = BBCoder::Tag.new("strong", :match_content => /^.*(png|bmp|jpg|gif)$/)
+        @singular_tag = BBCoder::Tag.new("strong", :match_content => /^.*(png|bmp|jpg|gif)$/, :singular => true)
+      end
+
+      it "should return false when tag content is invalid" do
+        @tag.content_valid?("image.exe", false).should == false
+      end
+
+      it "should return true when tag content is valid" do
+        @tag.content_valid?("image.png", false).should == true
+      end
+
+      it "should return false if content is nil" do
+        @tag.content_valid?(nil, false).should == false
+      end
+
+      it "should return true when tag content is nil and tag is singular" do
+        @singular_tag.content_valid?(nil, true).should == true
+      end
+    end
+
+    context "with match" do
+      before do
+        @tag = BBCoder::Tag.new("strong", :match => /^.*(png|bmp|jpg|gif)$/)
+        @singular_tag = BBCoder::Tag.new("strong", :match => /^.*(png|bmp|jpg|gif)$/, :singular => true)
+      end
+
+      it "should return false when tag content is invalid" do
+        @tag.content_valid?("image.exe", false).should == false
+      end
+
+      it "should return true when tag content is valid" do
+        @tag.content_valid?("image.png", false).should == true
+      end
+
+      it "should return false if content is nil" do
+        @tag.content_valid?(nil, false).should == false
+      end
+
+      it "should return true when tag content is nil and tag is singular" do
+        @singular_tag.content_valid?(nil, true).should == true
+      end
+    end
+  end # #content_valid?
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbcoder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17173760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17173760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &17173340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17173340
+  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
 email:
 - machinist@asceth.com
@@ -61,6 +71,7 @@ files:
 - spec/buffer_spec.rb
 - spec/buffer_tags_spec.rb
 - spec/spec_helper.rb
+- spec/tag_spec.rb
 homepage: http://github.com/asceth/bbcoder
 licenses: []
 post_install_message: 
@@ -81,8 +92,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bbcoder
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: BBCode parser
-test_files: []
+test_files:
+- spec/base_spec.rb
+- spec/bbcoder_spec.rb
+- spec/buffer_spec.rb
+- spec/buffer_tags_spec.rb
+- spec/spec_helper.rb
+- spec/tag_spec.rb