gyazz-markup 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aff1fc1d5b6df303b1221c09d509fe654b6ae55
-  data.tar.gz: 80586e91ec5f5d8d34e11ed4b1532ce78a3d5325
+  metadata.gz: f3604dcb701cdcc745821cd93eba990f766af7d9
+  data.tar.gz: adec3550f1f4825773a7acd621ad4a66dcca123e
 SHA512:
-  metadata.gz: a0e88fe9b17696df7a54e8d5b1b8ac8d02d0a31ee20e0edfb8c283e0122d28c5a076b77703978d23739f2e42eb8ee6ebeb827953cd57944bda9b959ffda29ad9
-  data.tar.gz: 226f84963e9f90b00874f2e50a51a5b6054a606ee982e22521e3f3ce4b53e414daf93fd3d2a364ddc7d61266ba9e97725173037119f1e6a08a9ef8f806accb9b
+  metadata.gz: b5cb1dfa1c6f411a440c527d7e48cf6dae3d505ca54ece2be80e607bb9bd027024dcbbaa2ba936507263a31e58813044c8376b3167a76878cd2e8fc529013a60
+  data.tar.gz: 598c0d654f2b642d3c016ba061f0ff4aa6613d26c9aa65518799a83c1af914afc8e96f939d03d75a4ae19634d9b0ad89919e9fa6be3436413a903789d6ea5f20

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.0 2013-04-07
+
+* add samples
+* create GyazzMarkup::Markup instance
+
 === 0.0.2 2013-04-07
 
 * use bundler gem template

data/README.md

@@ -17,15 +17,19 @@ Usage
 ```ruby
 require 'rubygems'
 require 'gyazz-markup'
-puts GyazzMarkup.markup(open("input.txt").read)
-```
+str = File.open("input.txt").read
 
-or
+gm = GyazzMarkup::Markup.new
+puts gm.markup str
+```
 
+config
 ```ruby
-puts GyazzMarkup.markup(open("input.txt").read, "shokai")
+gm = GyazzMarkup::Markup.new(:host => 'http://gyazz.com', :wiki => 'shokai')
+puts gm.markup str
 ```
 
+
 Contributing
 ------------
 

data/bin/gyazz-markup

@@ -5,7 +5,7 @@ require 'rubygems'
 
 require 'gyazz-markup'
 
-input, base = ARGV[0..1]
+input, wiki = ARGV[0..1]
 unless input
   STDERR.puts "== gyazz-markup v#{GyazzMarkup::VERSION}"
   STDERR.puts
@@ -14,4 +14,4 @@ unless input
   exit 1
 end
 
-puts GyazzMarkup.markup(open(input).read, base)
+puts GyazzMarkup::Markup.new(:wiki => wiki).markup(open(input).read)

data/lib/gyazz-markup.rb

@@ -1,4 +1,5 @@
 require 'gyazz-markup/version'
+require 'gyazz-markup/options'
 require 'gyazz-markup/markup'
 
 module GyazzMarkup

data/lib/gyazz-markup/markup.rb

@@ -1,53 +1,63 @@
 module GyazzMarkup
 
-  def self.markup(txt, base="test")
-    lines = txt.split(/[\r\n]/).delete_if{|line|
-      line.to_s.size < 1
-    }
-
-    pats = [
-            [ /\[{2,3}(https?:\/\/.+)\.(png|jpe?g|gif|bmp)\]{2,3}/, "<a href=\"#{$1}.#{$2}\"><img src=\"#{$1}.#{$2}\"></a>"],
-            [ /\[{2}(https?:\/\/.+)\]{2}/, "<a href=\"#{$1}\">#{$1}</a>"],
-            [ /\[\[(.+)\]\]/, "<a href=\"http://gyazz.com/#{base}/#{$1}\">#{$1}</a>"]
-           ]
-
-    lines.map do |line|
-      line = self.markup_url_with_image line
-      line = self.markup_image line
-      line = self.markup_strong line
-      line = self.markup_url_with_title line
-      line = self.markup_url line
-      line = self.markup_inner_link(line, base)
+  class Markup
+
+    def initialize(opts={})
+      @opts = GyazzMarkup::Options.default
+      opts.each do |k,v|
+        next unless @opts.has_key? k
+        next unless v
+        @opts[k] = v
+      end
     end
-  end
 
-  def self.markup_image(str)
-    pat = /\[{2,3}(https?:\/\/[^\s]+)\.(png|jpe?g|gif|bmp)\]{2,3}/
-    str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}.#{$2}\"><img src=\"#{$1}.#{$2}\"></a>")
-  end
+    def options
+      @opts
+    end
 
-  def self.markup_url(str)
-    pat = /\[{2}(https?:\/\/[^\s]+)\]{2}/
-    str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\">#{$1}</a>")
-  end
+    def markup(txt)
+      lines = txt.split(/[\r\n]/).delete_if{|line|
+        line.empty?
+      }
+
+      lines.map do |line|
+        line = markup_url_with_image line
+        line = markup_image line
+        line = markup_strong line
+        line = markup_url_with_title line
+        line = markup_url line
+        line = markup_inner_link line
+      end
+    end
 
-  def self.markup_inner_link(str, base='test')
-    pat = /\[{2}(.+)\]{2}/
-    str !~ pat ? str : str.gsub(pat, "<a href=\"http://gyazz.com/#{base}/#{$1}\">#{$1}</a>")
-  end
+    def markup_image(str)
+      pat = /\[{2,3}(https?:\/\/[^\s]+)\.(png|jpe?g|gif|bmp)\]{2,3}/
+      str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}.#{$2}\"><img src=\"#{$1}.#{$2}\"></a>")
+    end
 
-  def self.markup_strong(str)
-    pat = /\[{3}(.+)\]{3}/
-    str !~ pat ? str : str.gsub(pat, "<strong>#{$1}</strong>")
-  end
+    def markup_url(str)
+      pat = /\[{2}(https?:\/\/[^\s]+)\]{2}/
+      str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\">#{$1}</a>")
+    end
 
-  def self.markup_url_with_title(str)
-    pat = /\[{2}(https?:\/\/[^\s]+)\s(.+)\]{2}/
-    str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\">#{$2}</a>")
-  end
+    def markup_inner_link(str)
+      pat = /\[{2}(.+)\]{2}/
+      str !~ pat ? str : str.gsub(pat, "<a href=\"#{options[:host]}/#{options[:wiki]}/#{$1}\">#{$1}</a>")
+    end
+
+    def markup_strong(str)
+      pat = /\[{3}(.+)\]{3}/
+      str !~ pat ? str : str.gsub(pat, "<strong>#{$1}</strong>")
+    end
+
+    def markup_url_with_title(str)
+      pat = /\[{2}(https?:\/\/[^\s]+)\s(.+)\]{2}/
+      str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\">#{$2}</a>")
+    end
 
-  def self.markup_url_with_image(str)
-    pat = /\[{2}(https?:\/\/[^\s]+)\s(https?:\/\/[^\s]+)\.(png|jpe?g|gif|bmp)\]{2}/
-    str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\"><img src=\"#{$2}.#{$3}\"></a>")
+    def markup_url_with_image(str)
+      pat = /\[{2}(https?:\/\/[^\s]+)\s(https?:\/\/[^\s]+)\.(png|jpe?g|gif|bmp)\]{2}/
+      str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\"><img src=\"#{$2}.#{$3}\"></a>")
+    end
   end
 end

data/lib/gyazz-markup/options.rb

@@ -0,0 +1,12 @@
+module GyazzMarkup
+  class Options
+
+    def self.default
+      {
+        :host => 'http://gyazz.com',
+        :wiki => 'test'
+      }
+    end
+
+  end
+end

data/lib/gyazz-markup/version.rb

@@ -1,3 +1,3 @@
 module GyazzMarkup
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/samples/sample.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'gyazz-markup'
+
+if ARGV.empty?
+  fname = File.expand_path 'sample.txt', File.dirname(__FILE__)
+else
+  fname = ARGV.shift
+end
+
+str = File.open(fname).read
+gm = GyazzMarkup::Markup.new :host => 'http://gyazz.com', :wiki => 'test'
+
+puts gm.markup str

data/samples/sample.txt

@@ -0,0 +1,12 @@
+[[[強く表示]]]
+[[http://gyazo.com/f7b9ad3035e91e7c9d91aaa082ddb7f2.png]] こうすると、画像が入れられます
+新しいページへのリンクも作れる → [[ごはん]]
+URLをリンク [[http://shokai.org]]
+タイトル付きURLリンク → [[htts:/example.com 私のホームページ]]
+画像つきURLリンク [[https://shokai.org http://gyazo.com/b2c551db20c7ef6ad598b89e66be6517.png]]
+インデント
+ aaa
+  aaa1
+   aaa2
+ bbb
+  bbb2

data/test/test_gyazz-markup.rb

@@ -2,64 +2,75 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestGyazzMarkup < MiniTest::Unit::TestCase
 
+  def setup
+    @gm = GyazzMarkup::Markup.new
+  end
+
   def test_markup_image
     img_url = "http://example.com/foo.png"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'png image'
+    assert @gm.markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'png image'
     img_url = "http://example.com/foo.jpg"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'jpg image'
+    assert @gm.markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'jpg image'
     img_url = "http://example.com/foo.jpeg"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'jpeg image'
+    assert @gm.markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'jpeg image'
     img_url = "http://example.com/foo.bmp"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'bmp image'
+    assert @gm.markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'bmp image'
     img_url = "http://example.com/foo.gif"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'gif image'
+    assert @gm.markup_image("[[#{img_url}]]") == "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'gif image'
     img_url = "http://example.com/foo.baaarrr"
-    assert GyazzMarkup::markup_image("[[#{img_url}]]") != "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'not image'
+    assert @gm.markup_image("[[#{img_url}]]") != "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'not image'
   end
 
   def test_markup_url
     url = "http://example.com"
-    assert GyazzMarkup::markup_url("[[#{url}]]") == "<a href=\"#{url}\">#{url}</a>", 'http url'
+    assert @gm.markup_url("[[#{url}]]") == "<a href=\"#{url}\">#{url}</a>", 'http url'
     url = "https://example.com"
-    assert GyazzMarkup::markup_url("[[#{url}]]") == "<a href=\"#{url}\">#{url}</a>", 'https url'
+    assert @gm.markup_url("[[#{url}]]") == "<a href=\"#{url}\">#{url}</a>", 'https url'
     url = "ftp://example.com"
-    assert GyazzMarkup::markup_url("[[#{url}]]") != "<a href=\"#{url}\">#{url}</a>", 'not url'
+    assert @gm.markup_url("[[#{url}]]") != "<a href=\"#{url}\">#{url}</a>", 'not url'
   end
 
   def test_markup_inner_link
-    assert GyazzMarkup::markup_inner_link("[[foo bar]]") == "<a href=\"http://gyazz.com/test/foo bar\">foo bar</a>", "inner link without gyazz-name"
-    assert GyazzMarkup::markup_inner_link("[[foo bar]]", "baz") == "<a href=\"http://gyazz.com/baz/foo bar\">foo bar</a>", "inner link with gyazz-name"
+    assert @gm.markup_inner_link("[[foo bar]]") == "<a href=\"http://gyazz.com/test/foo bar\">foo bar</a>", "inner link without gyazz-name"
+  end
+
+  def test_markup_inner_link_with_opts
+    gm = GyazzMarkup::Markup.new :wiki => 'baz'
+    assert gm.markup_inner_link("[[foo bar]]") == "<a href=\"http://gyazz.com/baz/foo bar\">foo bar</a>", "inner link with gyazz-name"
+
+    gm = GyazzMarkup::Markup.new :host => 'http://mygyazz.com', :wiki => 'shokai'
+    assert gm.markup_inner_link("[[foo bar]]") == "<a href=\"http://mygyazz.com/shokai/foo bar\">foo bar</a>", "inner link with gyazz-name"
   end
 
   def test_markup_strong
-    assert GyazzMarkup::markup_strong("[[[foo]]]") == "<strong>foo</strong>", "strong"
-    assert GyazzMarkup::markup_strong("[[[foo bar baz]]]") == "<strong>foo bar baz</strong>", "strong with space"
+    assert @gm.markup_strong("[[[foo]]]") == "<strong>foo</strong>", "strong"
+    assert @gm.markup_strong("[[[foo bar baz]]]") == "<strong>foo bar baz</strong>", "strong with space"
   end
 
   def test_markup_url_with_title
-    assert GyazzMarkup::markup_url_with_title("[[http://example.com mypage]]") == "<a href=\"http://example.com\">mypage</a>", "url with title"
-    assert GyazzMarkup::markup_url_with_title("[[http://example.com my page]]") == "<a href=\"http://example.com\">my page</a>", "space in title"
+    assert @gm.markup_url_with_title("[[http://example.com mypage]]") == "<a href=\"http://example.com\">mypage</a>", "url with title"
+    assert @gm.markup_url_with_title("[[http://example.com my page]]") == "<a href=\"http://example.com\">my page</a>", "space in title"
   end
 
   def test_markup_url_with_image
     img_url = "http://example.com/foo.png"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with png image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with png image"
     img_url = "http://example.com/foo.jpg"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with jpg image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with jpg image"
     img_url = "http://example.com/foo.jpeg"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with jpeg image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with jpeg image"
     img_url = "http://example.com/foo.gif"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with gif image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with gif image"
     img_url = "http://example.com/foo.bmp"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with bmp image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") == "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with bmp image"
     img_url = "http://example.com/foo.baz"
     url = "http://example.com"
-    assert GyazzMarkup::markup_url_with_image("[[#{url} #{img_url}]]") != "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with not image"
+    assert @gm.markup_url_with_image("[[#{url} #{img_url}]]") != "<a href=\"#{url}\"><img src=\"#{img_url}\"></a>", "url with not image"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyazz-markup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -70,7 +70,10 @@ files:
 - gyazz-markup.gemspec
 - lib/gyazz-markup.rb
 - lib/gyazz-markup/markup.rb
+- lib/gyazz-markup/options.rb
 - lib/gyazz-markup/version.rb
+- samples/sample.rb
+- samples/sample.txt
 - test/test_gyazz-markup.rb
 - test/test_helper.rb
 homepage: https://github.com/shokai/gyazz-markup