xan_markup 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bac1b66d447ed5e88d8706b419f4e9cbc5280d1
-  data.tar.gz: 8b8c50c6337d5eec7845ab11f489f0e948c31381
+  metadata.gz: 05e381a7deb5e0db42d2d827db4c345e0728b6a3
+  data.tar.gz: 6396514774a171c956838a90c367cf526a000826
 SHA512:
-  metadata.gz: 181471f68d534fe74cb745539b172b05b2d947146c9502516f3e70e3230ceae78cd9fd302fd072d59b411f7a093d5c276f6cc9205eec62ff9b9c9220efc85e2c
-  data.tar.gz: 4462fb72d76f8c5987f0289511a69777b9d14cc65532e78e5ac392e5bc0e37ef976939e89d3705baa911caac39306ad159450e55f1b5314108834539160c42ce
+  metadata.gz: 598c3883525b6a7eaa3a1cffc92e1fc88c14d9ecc65e0b321802e7335eb724b52e90b77bc023a57ede7ce8cdc229ec086a712ef24d14ba6bc5f61b83785978aa
+  data.tar.gz: 33ad82ca24d68cde245a9be6577e52e737a77cbbee04dbb5d2c143fdd698419f7f005c1498d81c381393fcec2d76e0896f44b4979b5071e214cb709f39e5e8ba

data/Gemfile.lock

@@ -1,23 +1,67 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.2.1)
-    git (1.2.9.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    addressable (2.4.0)
+    builder (3.2.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.7)
+    highline (1.7.10)
+    jeweler (2.3.7)
+      builder
+      bundler (>= 1)
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    rake (10.4.2)
-    rdoc (4.0.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+      semver2
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    multi_json (1.12.2)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.3.0)
+    rdoc (6.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
@@ -27,3 +71,6 @@ DEPENDENCIES
   jeweler
   rdoc
   rspec
+
+BUNDLED WITH
+   1.16.0

data/README.md

@@ -32,6 +32,24 @@ You can pass attributes to tags
       ....
     end
 
+## Block
+
+    {{block}}This is my favorite movie{{/block}}
+
+    def markup_block(content: "")
+      content.upcase
+    end
+
+### Nesting is supported only for unique tags.
+
+You can:
+
+    {{block}} this {{normal_tag}} {{/block}}
+    {{block}} and {{block2}} nesting {{/block2}} {{/block}}
+
+You can't (currently):
+
+    {{block}}{{block}}{{/block}}{{/block}}
 
 ## Customization
 
@@ -55,7 +73,7 @@ For example using instance variables not helper methods:
       Markupizer.new(content).markupize &MyCustomCaller.new(self).call
     end
 
-You can change also syntax
+You can change also syntax (See MarkupSyntax and BlockMarkupSyntax in markupizer.rb)
 
     def markupize(content)
       Markupizer.new(content, /\[ ?(.*?) ?\]/).markupize &MyCustomCaller.new(self).call
@@ -64,4 +82,4 @@ You can change also syntax
     @favorite_movie = "Matrix"
     markupize("My favorite movie is [favorite_movie]") #=> My favorite movie is Matrix
 
-Copyright (c) 2009-20015 Grzegorz Derebecki, released under the MIT license
+Copyright (c) 2009-2018 Grzegorz Derebecki, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/xan_markup/content_tag.rb

@@ -0,0 +1,13 @@
+module XanMarkup
+  class ContentTag < Tag
+    attr_reader :content
+    def initialize(tag, content)
+      @tag = tag
+      @content = content
+    end
+
+    def args
+      super.merge(content: content)
+    end
+  end
+end

data/lib/xan_markup/markupizer.rb

@@ -1,23 +1,35 @@
 require 'xan_markup/tag'
+require 'xan_markup/content_tag'
 
 module XanMarkup
   class Markupizer
     MarkupSyntax                = /\{\{ ?(.*?) ?\}\}/
+    BlockMarkupSyntax           = /\{\{ ?((\w+)(.*?)) ?\}\}(.*?)\{\{ ?\/(\2) ?\}\}/
 
-    def initialize(content, syntax = MarkupSyntax)
+    def initialize(content, syntax = MarkupSyntax, block_syntax = BlockMarkupSyntax)
       @content = content.to_s.dup.to_str
       @syntax = syntax
+      @block_syntax = block_syntax
     end
 
     def tags
-      @content.scan(@syntax).map do |markup|
-        Tag.new(markup.first)
-      end
+      tags = []
+      markupize { |tag| tags << tag }
+      tags
+    end
+
+    def markupize(content = @content, &block)
+      content = markupize_syntax(@block_syntax, content, &block)
+      markupize_syntax(@syntax, content, &block)
     end
 
-    def markupize
-      @content.gsub(@syntax) do |markup|
-        yield Tag.new($1)
+    def markupize_syntax(syntax, content, &block)
+      content.gsub(syntax) do |markup|
+        if content = $4
+          yield ContentTag.new($1, markupize(content, &block))
+        else
+          yield Tag.new($1)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -7,6 +7,4 @@ require "xan_markup"
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |config|
-  
-end
+RSpec::Expectations.configuration.on_potential_false_positives = :nothing

data/spec/xan_markup/helper_spec.rb

@@ -21,7 +21,7 @@ module XanMarkup
     let(:helper) { TestHelper.new }
 
     it "should call property method when found tag" do
-      helper.should_receive(:markup_test)
+      expect(helper).to receive(:markup_test)
       helper.markupize("this is markup {{test}} tag")
     end
 
@@ -30,12 +30,12 @@ module XanMarkup
     end
 
     it "should return text that tag is not defined" do
-      helper.markupize("this is markup {{ test }} tag").should include("missing tag: test")
+      expect(helper.markupize("this is markup {{ test }} tag")).to include("missing tag: test")
     end
 
     it "should replace tag with content returned by markup markupizer" do
-      helper.stub(:markup_best_language).and_return("Ruby")
-      helper.markupize("Best language is: {{ best_language }}").should include("Ruby")
+      allow(helper).to receive_messages(markup_best_language: "Ruby")
+      expect(helper.markupize("Best language is: {{ best_language }}")).to include("Ruby")
     end
   end
 
@@ -44,48 +44,69 @@ module XanMarkup
 
     it "should replace content with data returned from block" do
       markupizer = Markupizer.new("this is markup {{test}} tag")
-      markupizer.markupize {|tag| "SUPER" }.should include("SUPER")
+      expect(markupizer.markupize {|tag| "SUPER" }).to include("SUPER")
     end
 
+    it "should allow block tag" do
+      markupizer = Markupizer.new("this is markup {{test}}tag{{/test}}")
+      expect(markupizer.markupize {|tag| tag.content.upcase }).to include("TAG")
+    end
+
+    it "should allow nestd block tags" do
+      markupizer = Markupizer.new("{{test}}tag {{test2}}test2{{/test2}}{{/test}}")
+      expect(markupizer.markupize {|tag| tag.content.upcase }).to eq("TAG TEST2")
+    end
+
+    it "should allow multiple identical tags in the same content" do
+      markupizer = Markupizer.new("{{test}}A{{/test}} {{test}}B{{/test}}")
+      expect(markupizer.markupize {|tag| tag.content }).to eq("A B")
+    end
+
+    it "should return two block tags" do
+      markupizer = Markupizer.new('this is {{a}}A{{/a}} markup {{b}}B{{/b}}')
+      expect(markupizer.tags.size).to eq(2)
+    end
+
+
+
     it "should return two tags (whitespaces allowed)" do
       markupizer = Markupizer.new('this is {{awesome}} markup {{test}}')
-      markupizer.should have(2).tags
+      expect(markupizer.tags.size).to eq(2)
     end
 
     it "should return tag even when whitespace inside tag is used" do
       markupizer = Markupizer.new('this is markup {{ test }} tag')
-      markupizer.should have(1).tags
+      expect(markupizer.tags.size).to eq(1)
     end
 
     it "should give tag object with proper name" do
       markupizer = Markupizer.new('this is markup {{test name="xan"}} tag')
-      markupizer.tags.first.name.should == "test"
+      expect(markupizer.tags.first.name).to eq("test")
     end
 
     it "should give tag object with proper args" do
       markupizer = Markupizer.new('this is markup {{test name="xan"}}')
-      markupizer.tags.first.args.should == {name: "xan"}
+      expect(markupizer.tags.first.args).to eq(name: "xan")
     end
 
     it "should give tag args when using single quotes" do
       markupizer = Markupizer.new("this is markup {{test name='xan'}} tag")
-      markupizer.tags.first.args.should == {name: "xan"}
+      expect(markupizer.tags.first.args).to eq(name: "xan")
     end
 
     it "should give tag args when quotes are skipped" do
       markupizer = Markupizer.new("this is markup {{test name=xan}} tag")
-      markupizer.tags.first.args.should == {name: "xan"}
+      expect(markupizer.tags.first.args).to eq(name: "xan")
     end
 
     it "should works with classes that inherance from string" do
       markupizer = Markupizer.new SafeBuffer.new("{{test}}")
-      markupizer.should have(1).tags
+      expect(markupizer.tags.size).to eq(1)
     end
 
     it "should allow change syntax" do
       markupizer = Markupizer.new "[test]", /\[ ?(.*?) ?\]/
-      markupizer.should have(1).tags
+      expect(markupizer.tags.size).to eq(1)
     end
-
   end
 end

data/xan_markup.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: xan_markup 0.3.0 ruby lib
+# stub: xan_markup 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "xan_markup"
-  s.version = "0.3.0"
+  s.name = "xan_markup".freeze
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Grzegorz Derebecki"]
-  s.date = "2015-02-10"
-  s.description = "Simple tag parser"
-  s.email = "grzegorz.derebecki@fdb.pl"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Grzegorz Derebecki".freeze]
+  s.date = "2018-01-02"
+  s.description = "Simple tag parser".freeze
+  s.email = "grzegorz.derebecki@fdb.pl".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/xan_markup.rb",
     "lib/xan_markup/caller.rb",
+    "lib/xan_markup/content_tag.rb",
     "lib/xan_markup/helper.rb",
     "lib/xan_markup/markupizer.rb",
     "lib/xan_markup/tag.rb",
@@ -36,30 +37,30 @@ Gem::Specification.new do |s|
     "spec/xan_markup/helper_spec.rb",
     "xan_markup.gemspec"
   ]
-  s.homepage = "http://github.com/madmax/xan_markup"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "simple tag parser"
+  s.homepage = "http://github.com/madmax/xan_markup".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "simple tag parser".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xan_markup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Grzegorz Derebecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,6 +84,7 @@ files:
 - VERSION
 - lib/xan_markup.rb
 - lib/xan_markup/caller.rb
+- lib/xan_markup/content_tag.rb
 - lib/xan_markup/helper.rb
 - lib/xan_markup/markupizer.rb
 - lib/xan_markup/tag.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: simple tag parser