gyazz-markup 0.0.1 → 0.0.2

checksums.yaml

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

data/.gitignore

@@ -0,0 +1,21 @@
+.DS_Store
+*~
+*#*
+.ruby-version
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in gyazz-markup.gemspec
+gemspec

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.2 2013-04-07
+
+* use bundler gem template
+* add tests
+* fix URL matcher
+
 === 0.0.1 2012-05-24
 
 * first release.

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2012-2013 Sho Hashimoto
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,36 @@
+gyazz-markup
+============
+convert Gyazz.com syntax to HTML.
+
+* https://github.com/shokai/gyazz-markup
+
+
+Installation
+------------
+
+    % gem install gyazz-markup
+
+
+Usage
+-----
+
+```ruby
+require 'rubygems'
+require 'gyazz-markup'
+puts GyazzMarkup.markup(open("input.txt").read)
+```
+
+or
+
+```ruby
+puts GyazzMarkup.markup(open("input.txt").read, "shokai")
+```
+
+Contributing
+------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,25 +1,8 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/gyazz-markup'
-
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'gyazz-markup' do
-  self.developer 'Sho Hashimoto', 'hashimoto@shokai.org'
-  self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
+require "bundler/gem_tasks"
+require "rake/testtask"
 
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
 end
 
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+task :default => :test

data/bin/gyazz-markup

@@ -1,14 +1,16 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
-## $:.unshift File.dirname(__FILE__)+'/../lib/'
 
 require 'gyazz-markup'
 
 input, base = ARGV[0..1]
 unless input
-  STDERR.puts "gyazz-markup input.txt"
-  STDERR.puts "gyazz-markup input.txt 増井"
+  STDERR.puts "== gyazz-markup v#{GyazzMarkup::VERSION}"
+  STDERR.puts
+  STDERR.puts "  % gyazz-markup input.txt"
+  STDERR.puts "  % gyazz-markup input.txt WIKINAME"
   exit 1
 end
 

data/gyazz-markup.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gyazz-markup/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "gyazz-markup"
+  spec.version       = GyazzMarkup::VERSION
+  spec.authors       = ["Sho Hashimoto"]
+  spec.email         = ["hashimoto@shokai.org"]
+  spec.description   = %q{convert Gyazz.com syntax to HTML.}
+  spec.summary       = spec.description
+  spec.homepage      = "https://github.com/shokai/gyazz-markup"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/).reject{|i| i == "Gemfile.lock" }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+end

data/lib/gyazz-markup/markup.rb

@@ -1,4 +1,3 @@
-
 module GyazzMarkup
 
   def self.markup(txt, base="test")
@@ -23,16 +22,16 @@ module GyazzMarkup
   end
 
   def self.markup_image(str)
-    pat = /\[{2,3}(https?:\/\/.+)\.(png|jpe?g|gif|bmp)\]{2,3}/
+    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_url(str)
-    pat = /\[{2}(https?:\/\/.+)\]{2}/
+    pat = /\[{2}(https?:\/\/[^\s]+)\]{2}/
     str !~ pat ? str : str.gsub(pat, "<a href=\"#{$1}\">#{$1}</a>")
   end
 
-  def self.markup_inner_link(str, base='gyazz')
+  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
@@ -43,12 +42,12 @@ module GyazzMarkup
   end
 
   def self.markup_url_with_title(str)
-    pat = /\[{2}(https?:\/\/.+)\s(.+)\]{2}/
+    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(https?:\/\/.+)\.(png|jpe?g|gif|bmp)\]{2}/
+    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

data/lib/gyazz-markup/version.rb

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

data/lib/gyazz-markup.rb

@@ -1,8 +1,5 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
+require 'gyazz-markup/version'
 require 'gyazz-markup/markup'
 
 module GyazzMarkup
-  VERSION = '0.0.1'
 end

data/test/test_gyazz-markup.rb

@@ -1,11 +1,65 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class TestGyazzMarkup < Test::Unit::TestCase
+class TestGyazzMarkup < MiniTest::Unit::TestCase
 
-  def setup
+  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'
+    img_url = "http://example.com/foo.jpg"
+    assert GyazzMarkup::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'
+    img_url = "http://example.com/foo.bmp"
+    assert GyazzMarkup::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'
+    img_url = "http://example.com/foo.baaarrr"
+    assert GyazzMarkup::markup_image("[[#{img_url}]]") != "<a href=\"#{img_url}\"><img src=\"#{img_url}\"></a>", 'not image'
   end
-  
-  def test_truth
-    assert true
+
+  def test_markup_url
+    url = "http://example.com"
+    assert GyazzMarkup::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'
+    url = "ftp://example.com"
+    assert GyazzMarkup::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"
+  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"
   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"
+  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"
+    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"
+    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"
+    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"
+    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"
+    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"
+  end
+
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
-require 'stringio'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/gyazz-markup'
+require 'rubygems'
+require 'minitest/autorun'
+
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'gyazz-markup'

metadata

@@ -1,127 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gyazz-markup
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2013-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: newgem
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
-        version: 1.5.3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 15
-        version: "2.15"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: markup Gyazz.com syntax.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: convert Gyazz.com syntax to HTML.
+email:
 - hashimoto@shokai.org
-executables: 
+executables:
 - gyazz-markup
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - History.txt
-- Manifest.txt
-- README.rdoc
-files: 
-- History.txt
-- Manifest.txt
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
+- bin/gyazz-markup
+- gyazz-markup.gemspec
 - lib/gyazz-markup.rb
 - lib/gyazz-markup/markup.rb
-- script/console
-- script/destroy
-- script/generate
+- lib/gyazz-markup/version.rb
 - test/test_gyazz-markup.rb
 - test/test_helper.rb
-- bin/gyazz-markup
-- .gemtest
-homepage: http://github.com/shokai/gyazz-markup
-licenses: []
-
+homepage: https://github.com/shokai/gyazz-markup
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: gyazz-markup
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: markup Gyazz.com syntax.
-test_files: 
+specification_version: 4
+summary: convert Gyazz.com syntax to HTML.
+test_files:
 - test/test_gyazz-markup.rb
 - test/test_helper.rb

data/Manifest.txt

@@ -1,12 +0,0 @@
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-lib/gyazz-markup.rb
-lib/gyazz-markup/markup.rb
-script/console
-script/destroy
-script/generate
-test/test_gyazz-markup.rb
-test/test_helper.rb
-bin/gyazz-markup

data/README.rdoc

@@ -1,46 +0,0 @@
-= gyazz-markup
-
-* http://github.com/shokai/gyazz-markup
-
-== DESCRIPTION:
-
-markup Gyazz.com syntax.
-
-== SYNOPSIS:
-
-  require 'rubygems'
-  require 'gyazz-markup'
-  puts GyazzMarkup.markup(open("input.txt").read)
-
-or
-
-  puts GyazzMarkup.markup(open("input.txt").read, "shokai")
-
-== INSTALL:
-
-* gem install gyazz-markup
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2012 Sho Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/gyazz-markup.rb'}"
-puts "Loading gyazz-markup gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)