xan_markup 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c9cac59c7bc0bd578dac5751d30f416645cb220
-  data.tar.gz: 4739e35d7e01e3db54049dde6c250490413b0547
+  metadata.gz: a72eecb5af9f00619a86b37553acd6c702ef520c
+  data.tar.gz: 78e0840af089ad5b0799e7f4432b6f48e03bab43
 SHA512:
-  metadata.gz: 52c8ac1ebd69f0097755bd6151f2ea049d18fc8bf7ba008e2ff7544c4eda8f287d1c0c7aefe615588a595bfb0e61c7328d660ba3996d06da855a8fd746cc2811
-  data.tar.gz: e9b0a6c7ec66882f2f585673ffa70c3ac232a8bc51cc20f80e77ea65ed28d78616f07ad21b9017ec1503535f948e3cb4f2a79a7c4f10e4e5c692f839c2ae9fc1
+  metadata.gz: 3d6a8f37316b8c6a8f8896f750bad74f10e6216d698f39a5a0fc3422f898cb13e88edbc3e32c82c340858375617a2f92171a988f286d12575951ee57b5345961
+  data.tar.gz: e9a75d1328b21364b5a9a8fa93c4effc1a59ae1b926e5b13ac45b0ce56e2ba01bb426bbfacf8a4a21b8c2671bf70f0127bf23878b7cdf3b20d278be0107f5848

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/xan_markup/caller.rb

@@ -0,0 +1,17 @@
+module XanMarkup
+  class Caller
+    def initialize(context)
+      @context = context
+    end
+
+    def call
+      ->(tag) do
+        if @context.respond_to?(tag.method)
+          @context.send(tag.method, tag.args)
+        else
+          "missing tag: #{tag.name}"
+        end
+      end
+    end
+  end
+end

data/lib/xan_markup/helper.rb

@@ -1,24 +1,10 @@
+require 'xan_markup/markupizer'
+require 'xan_markup/caller'
+
 module XanMarkup
-  MarkupSyntax                = /\{\{ ?(.*?) ?\}\}/
-  QuotedString                = /"[^"]+"|'[^']+'/
-  QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/
-  TagAttributes               = /(\w+)\s*\=\s*(#{QuotedFragment})/
-  CleanAttributeValue         = /^("|')|("|')$/
   module Helper
     def markupize(content)
-      content.to_s.dup.to_str.gsub(MarkupSyntax) do |markup|
-        args   = {}
-        tag    = $1.split.first
-        method = "markup_#{tag}"
-        $1.scan(TagAttributes) do |key, value|
-          args[key.to_sym] = value.gsub(CleanAttributeValue, "")
-        end
-        if respond_to?(method)
-          (args.empty? ? send(method) : send(method, args)).to_s
-        else
-          "missing tag: #{tag}"
-        end
-      end
+      Markupizer.new(content).markupize &Caller.new(self).call
     end
   end
 end

data/lib/xan_markup/markupizer.rb

@@ -0,0 +1,23 @@
+require 'xan_markup/tag'
+
+module XanMarkup
+  class Markupizer
+    MarkupSyntax                = /\{\{ ?(.*?) ?\}\}/
+
+    def initialize(content)
+      @content = content.to_s.dup.to_str
+    end
+
+    def tags
+      @content.scan(MarkupSyntax).map do |markup|
+        Tag.new(markup.first)
+      end
+    end
+
+    def markupize
+      @content.gsub(MarkupSyntax) do |markup|
+        yield Tag.new($1)
+      end
+    end
+  end
+end

data/lib/xan_markup/tag.rb

@@ -0,0 +1,28 @@
+module XanMarkup
+  class Tag
+    QuotedString = /"[^"]+"|'[^']+'/
+    QuotedFragment = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/
+    TagArgs = /(\w+)\s*\=\s*(#{QuotedFragment})/
+    CleanArgValue = /^("|')|("|')$/
+
+    def initialize(tag)
+      @tag = tag
+    end
+
+    def name
+      @tag.split.first
+    end
+
+    def args
+      {}.tap { |args| @tag.scan(TagArgs) { |key, value| args[key.to_sym] = value.gsub(CleanArgValue, "") } }
+    end
+
+    def args?
+      args.size > 0
+    end
+
+    def method
+      "markup_#{name}"
+    end
+  end
+end

data/spec/xan_markup/helper_spec.rb

@@ -1,9 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class XanMarkup::HelperTest
-  include XanMarkup::Helper
-end
-
 class SafeBuffer < String
   def gsub(*args, &block)
     super
@@ -14,65 +10,81 @@ class SafeBuffer < String
 
 end
 
-describe XanMarkup::Helper do
-  let(:helper) { XanMarkup::HelperTest.new }
+module XanMarkup
 
-  it "It should call property method when found tag" do
-    helper.should_receive(:markup_test)
-    helper.markupize("this is markup {{test}} tag")
+  class TestHelper
+    include Helper
   end
 
-  it "It should property parse one parameter" do
-    helper.should_receive(:markup_test).with(:name => "xan")
-    helper.markupize('this is markup {{test name="xan"}} tag')
-  end
 
-  it "It should property parse two parameters" do
-    helper.should_receive(:markup_test).with(:name => "xan", :next => "b")
-    helper.markupize('this is markup {{test name="xan" next="b"}} tag')
-  end
+  describe Helper do
+    let(:helper) { TestHelper.new }
 
-  it "It should allow use single quotes too" do
-    helper.should_receive(:markup_test).with(:name => "xan")
-    helper.markupize("this is markup {{test name='xan'}} tag")
-  end
+    it "should call property method when found tag" do
+      helper.should_receive(:markup_test)
+      helper.markupize("this is markup {{test}} tag")
+    end
 
-  it "It should allow skip quotes too" do
-    helper.should_receive(:markup_test).with(:name => "xan")
-    helper.markupize("this is markup {{test name=xan}} tag")
-  end
+    it "should not raise exception if tag is not defined" do
+      expect { helper.markupize("this is {{undefined}} tag")}.to_not raise_error(NoMethodError)
+    end
 
-  it "It should parse two tags property" do
-    helper.should_receive(:markup_test).twice
-    helper.markupize("this is markup {{test}} {{test}} tag")
-  end
+    it "should return text that tag is not defined" do
+      helper.markupize("this is markup {{ test }} tag").should include("missing tag: test")
+    end
 
-  it "It should allow white space at beggining and end tag" do
-    helper.should_receive(:markup_test)
-    helper.markupize("this is markup {{ test }} tag")
+    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")
+    end
   end
 
-  it "should not raise exception if tag is not defined" do
-    expect { helper.markupize("this is markup {{ test }} tag") }.to_not raise_error(NoMethodError)
-  end
 
-  it "should return text that tag is not defined" do
-    helper.markupize("this is markup {{ test }} tag").should include("missing tag: test")
-  end
+  describe Markupizer do
 
-  it "should replace tag with content returned by markup helper" do
-    helper.stub(:markup_best_language).and_return("Ruby")
-    helper.markupize("Best language is: {{ best_language }}").should include("Ruby")
-  end
+    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")
+    end
 
+    it "should return two tags (whitespaces allowed)" do
+      markupizer = Markupizer.new('this is {{awesome}} markup {{test}}')
+      markupizer.should have(2).tags
+    end
 
-  it "should works with classes that inherance from string" do
-    helper.should_receive(:markup_test)
-    helper.markupize SafeBuffer.new("{{test}}")
-  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
+    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"
+    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"}
+    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"}
+    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"}
+    end
 
 
 
+
+    it "should works with classes that inherance from string" do
+      markupizer = Markupizer.new SafeBuffer.new("{{test}}")
+      markupizer.should have(1).tags
+    end
+
+
+  end
 end

data/xan_markup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xan_markup"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grzegorz Derebecki"]
-  s.date = "2013-03-19"
+  s.date = "2013-05-20"
   s.description = "Simple tag parser"
   s.email = "grzegorz.derebecki@fdb.pl"
   s.extra_rdoc_files = [
@@ -26,7 +26,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/xan_markup.rb",
+    "lib/xan_markup/caller.rb",
     "lib/xan_markup/helper.rb",
+    "lib/xan_markup/markupizer.rb",
+    "lib/xan_markup/tag.rb",
     "spec/spec_helper.rb",
     "spec/xan_markup/helper_spec.rb",
     "xan_markup.gemspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xan_markup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Grzegorz Derebecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,10 @@ files:
 - Rakefile
 - VERSION
 - lib/xan_markup.rb
+- lib/xan_markup/caller.rb
 - lib/xan_markup/helper.rb
+- lib/xan_markup/markupizer.rb
+- lib/xan_markup/tag.rb
 - spec/spec_helper.rb
 - spec/xan_markup/helper_spec.rb
 - xan_markup.gemspec