wikilink-converter 0.1.0 → 0.2.1

data/Gemfile

@@ -16,8 +16,11 @@ group :development do
   gem 'guard-yard'
   gem 'redcarpet'
 
-  if HOST_OS =~ /linux/i
+  case HOST_OS
+  when /linux/i
     gem 'rb-inotify', require: false
     gem 'libnotify', require: false
+  when /darwin/i
+    gem 'growl_notify', require: false
   end
 end

data/Gemfile.lock

@@ -2,8 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    ffi (1.0.11)
     git (1.2.5)
+    growl_notify (0.0.3)
+      rb-appscript
     guard (0.8.8)
       thor (~> 0.14.6)
     guard-bundler (0.1.3)
@@ -18,11 +19,9 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    libnotify (0.5.9)
     multi_json (1.0.4)
     rake (0.9.2.2)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
+    rb-appscript (0.6.1)
     redcarpet (1.17.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -44,13 +43,12 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  growl_notify
   guard
   guard-bundler
   guard-rspec
   guard-yard
   jeweler
-  libnotify
-  rb-inotify
   redcarpet
   rspec
   simplecov

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/wikilink/converter/namespace.rb

@@ -5,6 +5,7 @@ module Wikilink
     # Namespace converter
     class Namespace
       include LinkHelper
+      include HTMLAttributes
 
       DEFAULT_NAME = ''
 
@@ -19,16 +20,17 @@ module Wikilink
         self
       end
 
-      def run(colon, path, name, current_page)
+      def run(run_options)
         if @block
-          instance_exec(colon, path, name, current_page, &@block)
+          instance_exec(run_options, &@block)
         end
       end
 
       class Default < Namespace
-        def run(colon, path, name, current_page)
+        def run(run_options)
           return super if @block
 
+          path = run_options[:path].to_s
           path, fragment = path.split('#', 2)
           path, query = path.split('?', 2)
 
@@ -37,7 +39,7 @@ module Wikilink
 
           url = to_url(path, fragment, query)
 
-          link_to(name, url, :class => html_class)
+          link_to(run_options[:name], url, :class => html_class(run_options[:class]))
         end
 
         def to_url(path, fragment, query)
@@ -48,11 +50,6 @@ module Wikilink
           end
         end
       end
-
-      protected
-      def html_class
-        [options[:class], ('external' if options[:external])]
-      end
     end
   end
 end

data/lib/wikilink/converter/site.rb

@@ -18,12 +18,12 @@ module Wikilink
         @options[:prefix] ||= '/' if is_current_site
         @namespace_converters = {}
 
-        on_namespace(DEFAULT_NAMESPACE)
+        namespace(DEFAULT_NAMESPACE)
         
         yield self if block_given?
       end
 
-      def on_namespace(*args, &block)
+      def namespace(*args, &block)
         namespace, converter, options = extract_arguments(*args)
         namespace = DEFAULT_NAMESPACE if namespace.to_s.empty?
         
@@ -50,27 +50,19 @@ module Wikilink
         set_namespace_converter namespace, converter if converter
         self
       end
-      alias_method :on, :on_namespace
-      alias_method :namespace, :on_namespace
 
-      def on_default_namespace(*args, &block)
-        on_namespace(DEFAULT_NAMESPACE, *args, &block)
+      def default_namespace(*args, &block)
+        namespace(DEFAULT_NAMESPACE, *args, &block)
       end
-      alias_method :default_namespace, :on_default_namespace
 
-      def run(colon, namespace, path, name, current_page)
+      def run(namespace, run_options)
         if converter = namespace_converter(namespace)
-          converter.run(colon, path, name, current_page)
+          converter.run(run_options)
         elsif converter = instance_method_converter(namespace)
-          converter.call(colon, path, name, current_page)
+          converter.call(run_options)
         end
       end
 
-      protected
-      def html_class
-        [options[:class], ('external' if options[:external])]
-      end
-
       private
       def namespace_converter(namespace)
         namespace = namespace.to_s.downcase
@@ -79,7 +71,11 @@ module Wikilink
 
       def instance_method_converter(namespace)
         namespace = namespace.to_s.downcase
-        try_message = "on_namespace_#{namespace}".to_sym
+        if namespace == DEFAULT_NAMESPACE
+          try_message = :run_default_namespace
+        else
+          try_message = "run_namespace_#{namespace}".to_sym
+        end
         method(try_message) if respond_to?(try_message)
       end
 

data/lib/wikilink/converter/sites/ruby_china.rb

@@ -6,6 +6,7 @@ module Wikilink
     module Sites
       class RubyChina < Wikilink::Converter::Site
         include Wikilink::Converter::LinkHelper
+        include Wikilink::Converter::HTMLAttributes
 
         def initialize(options = {})
           if options[:name] == CURRENT_SITE
@@ -18,14 +19,14 @@ module Wikilink
           super(options)
         end
 
-        def on_namespace_topic(colon, path, name, current_page)
-          path = "#{options[:domain]}topics/#{path}"
-          link_to name, path, :class => html_class
+        def run_namespace_topic(run_options)
+          path = "#{options[:domain]}topics/#{run_options[:path]}"
+          link_to run_options[:name], path, :class => html_class(run_options[:class])
         end
 
-        def on_namespace_node(colon, path, name, current_page)
-          path = "#{options[:domain]}topics/node#{path}"
-          link_to name, path, :class => html_class
+        def run_namespace_node(run_options)
+          path = "#{options[:domain]}topics/node#{run_options[:path]}"
+          link_to run_options[:name], path, :class => html_class(run_options[:class])
         end
       end
 

data/lib/wikilink/converter/utils.rb

@@ -33,5 +33,19 @@ module Wikilink
         "<a #{attributes}href=\"#{CGI.escape_html url}\">#{CGI.escape_html name}</a>"
       end
     end
+
+    module HTMLAttributes
+      def html_class(extra_classes = nil)
+        classes = []
+        if respond_to? :options
+          classes << options[:class]
+          classes << 'external' if options[:external]
+        end
+
+        classes << extra_classes if extra_classes
+
+        classes.flatten.join(' ').split.uniq.join(' ')
+      end
+    end
   end
 end

data/lib/wikilink/converter.rb

@@ -25,6 +25,21 @@ module Wikilink
     include ArgumentExtractor
     CURRENT_SITE = ::Wikilink::Converter::Site::CURRENT_SITE_NAME
 
+    class << self
+      extend Forwardable
+      def instance
+        @instance ||= Converter.new
+      end
+      def config
+        yield instance
+      end
+      def_delegators(:instance,
+                     :run, :execute,
+                     :namespace, :default_namespace,
+                     :site, :current_site,
+                     :action)
+    end
+
     # Setup a converter. Handlers can be registered in block directly. If no
     # handler is registered on **page**, a default handler
     # Wikilink::Converter::Page is created with the given `options`.
@@ -35,11 +50,11 @@ module Wikilink
       @action_handlers = {}
       @options = options
 
-      on_site(CURRENT_SITE, @options)
+      site(CURRENT_SITE, @options)
       yield self if block_given?
     end
 
-    def run(text, current_page = nil)
+    def run(text, run_options = {})
       text.gsub(/(^|.)\[\[(.*?[^:])\]\]/) do |match|
         prefix, inner = $1, $2.strip
         if prefix == '\\'
@@ -61,12 +76,13 @@ module Wikilink
           end
           
           if name.to_s.empty?
-            name = resolve_name(inner, current_page)
+            name = resolve_name(inner, run_options)
           end
 
           # ignore malformed wikilink
           if valid?(site, namespace, path)
-            result = convert_link(colon, site, namespace, path, name, current_page)
+            run_options = run_options.merge(path: path, name: name, colon: colon)
+            result = convert_link(site, namespace, run_options)
             result ? ($1 + result) : match
           else
             match
@@ -88,14 +104,10 @@ module Wikilink
       end
     end
 
-    def_delegator :@current_site_converter, :on_namespace
-    alias_method :on, :on_namespace
-    alias_method :namespace, :on_namespace
-
-    def_delegator :@current_site_converter, :on_default_namespace
-    alias_method :default_namespace, :on_default_namespace
+    def_delegator :@current_site_converter, :namespace
+    def_delegator :@current_site_converter, :default_namespace
 
-    def on_site(*args)
+    def site(*args)
       site, converter, options = extract_arguments(*args)
       options = @options.merge(options)
       site = CURRENT_SITE if site.to_s.empty?
@@ -111,19 +123,15 @@ module Wikilink
       set_site_converter site, converter
       self
     end
-    alias_method :site, :on_site
 
-    def on_current_site(*args, &block)
-      on_site(CURRENT_SITE, *args, &block)
+    def current_site(*args, &block)
+      site(CURRENT_SITE, *args, &block)
     end
-    alias_method :current_site, :on_current_site
 
-    def on_action(action, &block)
-      @action_handlers[action.to_s.downcase] = block
+    def action(name, &block)
+      @action_handlers[name.to_s.downcase] = block
       self
     end
-    alias_method :action, :on_action
-
 
     private
     def site_converter(site)
@@ -145,15 +153,15 @@ module Wikilink
       handler.call(argument) if handler
     end
 
-    def convert_link(colon, site, namespace, path, name, current_page)
+    def convert_link(site, namespace, run_options)
       converter = site_converter(site)
-      converter.run(colon, namespace, path, name, current_page) if converter
+      converter.run(namespace, run_options) if converter
     end
 
     # TODO: relative
     # TODO: ruby (computer) -> ruby
     # TODO: Shanghai, China -> Shanghai
-    def resolve_name(inner_text, current_path)
+    def resolve_name(inner_text, run_options)
       if inner_text.end_with?('|')
         inner_text.chop.chomp('/').split(%r{[:/]}, 2).last
       else

data/spec/wikilink/converter/namespace_spec.rb

@@ -9,7 +9,7 @@ shared_examples 'converter that can forward to given block' do |klass|
     describe '#run' do
       subject { converter.method(:run) }
       it 'forwards to the block' do
-        subject.should convert(':', 'Home', 'Home', '/').to('it works')
+        subject.should convert(name: 'Home', path: 'Home').to('it works')
       end
     end
   end
@@ -22,7 +22,7 @@ shared_examples 'converter that can forward to given block' do |klass|
     describe '#run' do
       subject { converter.method(:run) }
       it 'forwards to the block and allows options access' do
-        subject.should convert(':', 'Home', 'Home', '/').to('fake')
+        subject.should convert(name: 'Home', path: 'Home').to('fake')
       end
     end
   end
@@ -33,7 +33,7 @@ describe Wikilink::Converter::Namespace do
   describe '#run' do
     subject { converter.method(:run) }
     it 'does nothing' do
-      subject.should convert(':', 'Home', 'Home', '/').to(nil)
+      subject.should convert(name: 'Home', path: 'Home').to(nil)
     end
   end
 
@@ -41,14 +41,16 @@ describe Wikilink::Converter::Namespace do
 end
 
 describe Wikilink::Converter::Namespace::Default do
+  let(:run_options) { { name: 'Name', path: 'Home' } }
+
   shared_examples 'converter that keeps query fragment only path untouched' do
-    it { should convert(':', '#toc-1', 'Header 1', '/').
+    it { should convert(path: '#toc-1', name: 'Header 1').
       to('<a href="#toc-1">Header 1</a>')
     }
-    it { should convert(':', '?q=keyword', 'Search keyword', '/').
+    it { should convert(path: '?q=keyword', name: 'Search keyword').
       to('<a href="?q=keyword">Search keyword</a>')
     }
-    it { should convert(':', '?q=keyword#page-10', 'Search keyword (page 10)', '/').
+    it { should convert(path: '?q=keyword#page-10', name: 'Search keyword (page 10)').
       to('<a href="?q=keyword#page-10">Search keyword (page 10)</a>')
     }
   end
@@ -56,7 +58,7 @@ describe Wikilink::Converter::Namespace::Default do
   let(:converter) { self.class.describes.new }
   describe '#run' do
     subject { converter.method(:run) }
-    it { should convert(':', 'Home', 'Name', '/').
+    it { should convert(run_options).
       to('<a href="Home">Name</a>')
     }
     it_behaves_like 'converter that keeps query fragment only path untouched'
@@ -74,7 +76,7 @@ describe Wikilink::Converter::Namespace::Default do
     let(:converter) { self.class.describes.new suffix: '/index.html' }
     describe '#run' do
       subject { converter.method(:run) }
-      it { should convert(':', 'Home', 'Name', '/').
+      it { should convert(run_options).
         to('<a href="Home/index.html">Name</a>')
       }
       it_behaves_like 'converter that keeps query fragment only path untouched'
@@ -85,7 +87,7 @@ describe Wikilink::Converter::Namespace::Default do
     let(:converter) { self.class.describes.new external: true }
     describe '#run' do
       subject { converter.method(:run) }
-      it { should convert(':', 'Home', 'Name', '/').
+      it { should convert(run_options).
         to('<a class="external" href="Home">Name</a>')
       }
     end
@@ -94,7 +96,7 @@ describe Wikilink::Converter::Namespace::Default do
     let(:converter) { self.class.describes.new class: 'fancy' }
     describe '#run' do
       subject { converter.method(:run) }
-      it { should convert(':', 'Home', 'Name', '/').
+      it { should convert(run_options).
         to('<a class="fancy" href="Home">Name</a>')
       }
     end
@@ -103,7 +105,7 @@ describe Wikilink::Converter::Namespace::Default do
     let(:converter) { self.class.describes.new external: true, class: 'fancy' }
     describe '#run' do
       subject { converter.method(:run) }
-      it { should convert(':', 'Home', 'Name', '/').
+      it { should convert(run_options).
         to('<a class="fancy external" href="Home">Name</a>')
       }
     end

data/spec/wikilink/converter/site_spec.rb

@@ -4,51 +4,15 @@ describe Wikilink::Converter::Site do
   DEFAULT_NAMESPACE = Wikilink::Converter::Site::DEFAULT_NAMESPACE
   CURRENT_SITE_NAME = Wikilink::Converter::Site::CURRENT_SITE_NAME
 
-  # { subject.foo }.should forward(:bar).to(handler).with(any_args)
-  RSpec::Matchers.define :forward do |message|
-    match do |block|
-      block.call
-      @handler.received_message?(message, *@arguments)
-    end
-
-    description do
-      "forward to message #{message} to #{@handler.inspect}"
-    end
-
-    failure_message_for_should do |block|
-      <<MESSAGE
-expected forward #{message}
-      to #{block}
-    with #{@arguments.inspect}
-MESSAGE
-    end
-
-    failure_message_for_should_not do |block|
-      <<MESSAGE
-expected not forward #{message}
-      to #{block}
-    with #{@arguments.inspect}
-MESSAGE
-    end
-
-    chain :with do |*arguments|
-      @arguments = arguments
-    end
-
-    chain :to do |handler|
-      @handler = handler
-    end
-  end
-
   shared_examples 'configuring a new instance of class as namespace handler' do |namespace|
     # require setting converter to an instance of Site
     context 'with converter class' do
       class SpecNamespace; end
       define_method :call do |*args|
         if namespace.to_s.empty?
-          converter.on_namespace SpecNamespace, *args
+          converter.namespace SpecNamespace, *args
         else
-          converter.on_namespace namespace, SpecNamespace, *args
+          converter.namespace namespace, SpecNamespace, *args
         end
       end
       let(:namespace_converter) { double(:namespace_converter) }
@@ -62,7 +26,7 @@ MESSAGE
         SpecNamespace.should_receive(:new).once.and_return(namespace_converter)
         call
         namespace_converter.should_receive(:run).and_return('it works')
-        converter.run(':', namespace, 'Home', 'Name', '/').should eq('it works')
+        converter.run(namespace, path: 'Home', name: 'Name').should eq('it works')
       end
 
       context 'and options' do
@@ -82,6 +46,7 @@ MESSAGE
 
   let(:default_namespace) { double(:default_namespace).as_null_object }
   let(:namespace) { double(:namespace).as_null_object }
+  let(:run_options) { { path: 'Home', name: 'Name' } }
   before { Wikilink::Converter::Namespace::Default.stub(:new) { default_namespace } }
 
   shared_examples ''
@@ -133,26 +98,26 @@ MESSAGE
 
     describe '#run' do
       it 'delegates default namespace to Namespace::Default instance' do
-        ->{ converter.run(':', DEFAULT_NAMESPACE, 'Home', 'Name', '/') }.
-          should forward(:run).to(default_namespace).with(':', 'Home', 'Name', '/')
+        default_namespace.should_receive(:run).with(hash_including(run_options))
+        converter.run(DEFAULT_NAMESPACE, run_options)
       end
     end
 
-    describe '#on_default_namespace' do
-      it 'is a shortcut of #on_namespace' do
-        converter.should_receive(:on_namespace).with(DEFAULT_NAMESPACE, 'arg')
-        converter.on_default_namespace 'arg'
+    describe '#default_namespace' do
+      it 'is a shortcut of #namespace' do
+        converter.should_receive(:namespace).with(DEFAULT_NAMESPACE, 'arg')
+        converter.default_namespace 'arg'
       end
     end
 
-    describe '#on_namespace' do
+    describe '#namespace' do
       context 'without any arguments nor block' do
         let(:default_namespace) { double(:default_namespace) }
 
         it 'does not change the default namespace handler' do
           Wikilink::Converter::Namespace::Default.should_receive(:new).
             once.and_return(default_namespace)
-          converter.on_namespace
+          converter.namespace
         end
       end
 
@@ -161,7 +126,7 @@ MESSAGE
           yielded = double('yielded')
           yielded.should_receive(:poke)
           default_namespace.should_receive(:config).and_yield
-          converter.on_namespace do
+          converter.namespace do
             yielded.poke
           end
         end
@@ -173,7 +138,7 @@ MESSAGE
         it 'does not change the default namespace handler' do
           Wikilink::Converter::Namespace::Default.should_receive(:new).
             once.and_return(default_namespace)
-          converter.on_namespace foo: :bar
+          converter.namespace foo: :bar
         end
       end
 
@@ -183,37 +148,37 @@ MESSAGE
         it 'does not change the default namespace handler' do
           Wikilink::Converter::Namespace::Default.should_receive(:new).
             once.and_return(default_namespace)
-          converter.on_namespace(DEFAULT_NAMESPACE)
+          converter.namespace(DEFAULT_NAMESPACE)
         end
       end
       context 'with other namespace name' do
-        let(:name) { 'topics' }
+        let(:namespace_name) { 'topics' }
         let(:klass) { Wikilink::Converter::Namespace }
 
         it 'creates a new Wikilink::Converter::Namespace instance' do
           klass.should_receive(:new)
-          converter.on_namespace name
+          converter.namespace namespace_name
         end
         it 'initializes Wikilink::Converter::Namespace instance with option :site_name' do
           klass.should_receive(:new).with(hash_including(site_name: site_name))
-          converter.on_namespace name
+          converter.namespace namespace_name
         end
         it 'initializes Wikilink::Converter::Namespace instance with option :name' do
-          klass.should_receive(:new).with(hash_including(name: name))
-          converter.on_namespace name
+          klass.should_receive(:new).with(hash_including(name: namespace_name))
+          converter.namespace namespace_name
         end
         it 'uses the instance of Wikilink::Converter::Namespace as new namespace converter' do
           klass.should_receive(:new).and_return(namespace)
-          converter.on_namespace name
+          converter.namespace namespace_name
           namespace.should_receive(:run).and_return('it works')
-          converter.run(':', name, 'Home', 'Name', '/').should eq('it works')
+          converter.run(namespace_name, run_options).should eq('it works')
         end
 
         context 'with object' do
           it 'uses that object as new namespace converter' do
-            converter.on_namespace name, namespace
+            converter.namespace namespace_name, namespace
             namespace.should_receive(:run).and_return('it works')
-            converter.run(':', name, 'Home', 'Name', '/').should eq('it works')
+            converter.run(namespace_name, run_options).should eq('it works')
           end
         end
 
@@ -224,9 +189,9 @@ MESSAGE
       
       context 'with object' do
         it 'uses that object as new namespace converter' do
-          converter.on_namespace namespace
+          converter.namespace namespace
           namespace.should_receive(:run).and_return('it works')
-          converter.run(':', DEFAULT_NAMESPACE, 'Home', 'Name', '/').should eq('it works')
+          converter.run(DEFAULT_NAMESPACE, run_options).should eq('it works')
         end
       end
 
@@ -276,20 +241,20 @@ MESSAGE
 
     describe '#run' do
       it 'delegates default namespace to Namespace::Default instance' do
-        ->{ converter.run(':', DEFAULT_NAMESPACE, 'Home', 'Name', '/') }.
-          should forward(:run).to(default_namespace).with(':', 'Home', 'Name', '/')
+        default_namespace.should_receive(:run).with(hash_including(run_options))
+        converter.run(DEFAULT_NAMESPACE, run_options)
       end
 
-      context 'with method #on_namespace_topics defined' do
+      context 'with method #run_namespace_topics defined' do
         before { Wikilink::Converter::Namespace::Default.unstub(:new) }
         class SpecSite < Wikilink::Converter::Site
-          def on_namespace_topics(colon, path, name, current_page)
+          def run_namespace_topics(run_options)
             'it works'
           end
         end
         let(:converter) { SpecSite.new }
-        it 'invokes #on_namespace_topics to handle namespace topics' do
-          converter.run(':', 'topics', 'Home', 'Name', '/').should eq('it works')
+        it 'invokes #run_namespace_topics to handle namespace topics' do
+          converter.run('topics', run_options).should eq('it works')
         end
 
         context 'but user has override it' do
@@ -300,21 +265,21 @@ MESSAGE
           }
 
           it 'uses user version' do
-            converter.run(':', 'topics', 'Home', 'Name', '/').should eq('use this version')
+            converter.run('topics', run_options).should eq('use this version')
           end
         end
       end
 
-      context 'with method #on_namespace_ defined' do
+      context 'with method #run_default_namespace defined' do
         before { Wikilink::Converter::Namespace::Default.unstub(:new) }
         class SpecSite < Wikilink::Converter::Site
-          def on_namespace_(colon, path, name, current_page)
+          def run_default_namespace(run_options)
             'it works'
           end
         end
         let(:converter) { SpecSite.new }
-        it 'invokes #on_namespace_ to handle default namespace' do
-          converter.run(':', DEFAULT_NAMESPACE, 'Home', 'Name', '/').should eq('it works')
+        it 'invokes #run_default_namespace to handle default namespace' do
+          converter.run(DEFAULT_NAMESPACE, run_options).should eq('it works')
         end
 
         context 'but user has override it' do
@@ -325,7 +290,7 @@ MESSAGE
           }
 
           it 'uses user version' do
-            converter.run(':', DEFAULT_NAMESPACE, 'Home', 'Name', '/').should eq('use this version')
+            converter.run(DEFAULT_NAMESPACE, run_options).should eq('use this version')
           end
         end
       end

data/spec/wikilink/converter_spec.rb

@@ -1,8 +1,36 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
+shared_examples 'singleton' do |klass|
+  describe '.instance' do
+    subject { klass }
+    its(:instance) { should be_a_kind_of(klass) }
+    it 'returns the same instances for all calls to #instance' do
+      klass.instance.should equal(klass.instance)
+    end
+  end
+end
+
 describe Wikilink::Converter do
   CURRENT_SITE = Wikilink::Converter::CURRENT_SITE
 
+  it_behaves_like 'singleton', Wikilink::Converter
+  describe '.config' do
+    it 'yields the singleton instance' do
+      Wikilink::Converter.config do |arg|
+        arg.should equal(Wikilink::Converter.instance)
+      end
+    end
+  end
+
+  %w{run execute}.each do |method|
+    describe ".#{method}" do
+      it "forwards method #{method} to #instance" do
+        Wikilink::Converter.instance.should_receive(method.to_sym).with(:arg)
+        Wikilink::Converter.send method.to_sym, :arg
+      end
+    end
+  end
+
   let(:converter) { Wikilink::Converter.new }
 
   describe '#run' do
@@ -39,7 +67,7 @@ describe Wikilink::Converter do
     context 'in namespace topics' do
       context 'with default handler' do
         before do
-          converter.on('topics', Wikilink::Converter::Namespace::Default)
+          converter.namespace('topics', Wikilink::Converter::Namespace::Default)
         end
         it { should convert('[[topics:World]]').to('<a href="/World">topics:World</a>') }
       end
@@ -63,23 +91,30 @@ describe Wikilink::Converter do
       context 'in namespace topics' do
         context 'with default handler' do
           before do
-            converter.on('topics', Wikilink::Converter::Namespace::Default)
+            converter.namespace('topics', Wikilink::Converter::Namespace::Default)
           end
           it { should convert('[[topics:World|]]').to('<a href="/World">World</a>') }
           it { should convert('[[:topics:World|]]').to('<a href="/World">World</a>') }
         end
       end
     end
+    it 'passes options to namespace converter' do
+      Wikilink::Converter::Site.any_instance.should_receive(:run) { |*args|
+        args.last[:hello].should eq('world')
+        'result'
+      }
+      converter.run('[[Hello]]', hello: 'world')
+    end
   end
 
-  describe '#on_default_site' do
-    it 'is a shortcut of #on_site' do
-      converter.should_receive(:on_site).with(CURRENT_SITE, 'arg')
-      converter.on_current_site 'arg'
+  describe '#default_site' do
+    it 'is a shortcut of #site' do
+      converter.should_receive(:site).with(CURRENT_SITE, 'arg')
+      converter.current_site 'arg'
     end
   end
 
-  describe '#on_site' do
+  describe '#site' do
     let(:default_site) { double(:default_site).as_null_object }
     let(:site) { double(:site).as_null_object }
     before { Wikilink::Converter::Site.stub(:new) { default_site } }
@@ -89,10 +124,10 @@ describe Wikilink::Converter do
       it 'does not create new instance' do
         converter # call it to initialize first
         Wikilink::Converter::Site.should_not_receive :new
-        converter.on_site
+        converter.site
       end
       it 'yields the default site converter' do
-        converter.on_site do |site_converter|
+        converter.site do |site_converter|
           site_converter.should eq(default_site)
         end
       end
@@ -102,17 +137,17 @@ describe Wikilink::Converter do
       it 'creates a new instance of Wikilink::Converter::Site as the site converter' do
         converter # call it to initialize first
         Wikilink::Converter::Site.should_receive(:new).once
-        converter.on_site 'wikipedia'
+        converter.site 'wikipedia'
       end
       it 'initializes the instance with option :name' do
         converter # call it to initialize first
         Wikilink::Converter::Site.should_receive(:new).with(hash_including(name: 'wikipedia')).once
-        converter.on_site 'wikipedia'
+        converter.site 'wikipedia'
       end
       it 'yields the new converter instance' do
         converter # call it to initialize first
         Wikilink::Converter::Site.should_receive(:new).once.and_return(site)
-        converter.on_site('wikipedia') do |site_converter|
+        converter.site('wikipedia') do |site_converter|
           site_converter.should eq(site)
         end
       end
@@ -121,7 +156,7 @@ describe Wikilink::Converter do
         it 'initializes the instance with given options' do
           converter # call it to initialize first
           Wikilink::Converter::Site.should_receive(:new).with(hash_including(foo: :bar)).once
-          converter.on_site 'wikipedia', options
+          converter.site 'wikipedia', options
         end
       end
     end
@@ -130,10 +165,10 @@ describe Wikilink::Converter do
       it 'does not create new instance' do
         converter # call it to initialize first
         Wikilink::Converter::Site.should_not_receive :new
-        converter.on_site site
+        converter.site site
       end
       it 'yields the object' do
-        converter.on_site(site) do |site_converter|
+        converter.site(site) do |site_converter|
           site_converter.should eq(site)
         end
       end
@@ -152,7 +187,7 @@ describe Wikilink::Converter do
 
     context 'with handler registered on action toc' do
       before {
-        converter.on_action('toc') do |arg|
+        converter.action('toc') do |arg|
           "Table of Contents#{arg}"
         end
       }

data/wikilink-converter.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{wikilink-converter}
-  s.version = "0.1.0"
+  s.name = "wikilink-converter"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ian Yang}]
-  s.date = %q{2011-12-04}
-  s.description = %q{convert [[WikiLink]] to <a>}
-  s.email = %q{me@iany.me}
+  s.authors = ["Ian Yang"]
+  s.date = "2011-12-06"
+  s.description = "convert [[WikiLink]] to <a>"
+  s.email = "me@iany.me"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -44,11 +44,11 @@ Gem::Specification.new do |s|
     "spec/wikilink/converter_spec.rb",
     "wikilink-converter.gemspec"
   ]
-  s.homepage = %q{http://github.com/doitian/wikilink-converter}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{convert [[WikiLink]] to <a>}
+  s.homepage = "http://github.com/doitian/wikilink-converter"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "convert [[WikiLink]] to <a>"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -64,8 +64,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<guard-bundler>, [">= 0"])
       s.add_development_dependency(%q<guard-yard>, [">= 0"])
       s.add_development_dependency(%q<redcarpet>, [">= 0"])
-      s.add_development_dependency(%q<rb-inotify>, [">= 0"])
-      s.add_development_dependency(%q<libnotify>, [">= 0"])
+      s.add_development_dependency(%q<growl_notify>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -77,8 +76,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<guard-bundler>, [">= 0"])
       s.add_dependency(%q<guard-yard>, [">= 0"])
       s.add_dependency(%q<redcarpet>, [">= 0"])
-      s.add_dependency(%q<rb-inotify>, [">= 0"])
-      s.add_dependency(%q<libnotify>, [">= 0"])
+      s.add_dependency(%q<growl_notify>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
@@ -91,8 +89,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<guard-bundler>, [">= 0"])
     s.add_dependency(%q<guard-yard>, [">= 0"])
     s.add_dependency(%q<redcarpet>, [">= 0"])
-    s.add_dependency(%q<rb-inotify>, [">= 0"])
-    s.add_dependency(%q<libnotify>, [">= 0"])
+    s.add_dependency(%q<growl_notify>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikilink-converter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16725440 !ruby/object:Gem::Requirement
+  requirement: &2153445440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16725440
+  version_requirements: *2153445440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16724920 !ruby/object:Gem::Requirement
+  requirement: &2153444940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16724920
+  version_requirements: *2153444940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16724440 !ruby/object:Gem::Requirement
+  requirement: &2153444460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16724440
+  version_requirements: *2153444460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16723920 !ruby/object:Gem::Requirement
+  requirement: &2153443960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16723920
+  version_requirements: *2153443960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16723420 !ruby/object:Gem::Requirement
+  requirement: &2153443480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16723420
+  version_requirements: *2153443480
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &16722940 !ruby/object:Gem::Requirement
+  requirement: &2153443000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16722940
+  version_requirements: *2153443000
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &16722440 !ruby/object:Gem::Requirement
+  requirement: &2153442520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16722440
+  version_requirements: *2153442520
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &16721920 !ruby/object:Gem::Requirement
+  requirement: &2153442020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16721920
+  version_requirements: *2153442020
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &16721420 !ruby/object:Gem::Requirement
+  requirement: &2153441500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16721420
+  version_requirements: *2153441500
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &16720940 !ruby/object:Gem::Requirement
+  requirement: &2153440980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16720940
+  version_requirements: *2153440980
 - !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: &16720420 !ruby/object:Gem::Requirement
+  name: growl_notify
+  requirement: &2153440420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,18 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16720420
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: &16719920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *16719920
+  version_requirements: *2153440420
 description: convert [[WikiLink]] to <a>
 email: me@iany.me
 executables: []
@@ -192,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3886316938632370921
+      hash: -3433314059402378483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: convert [[WikiLink]] to <a>