ss_syntax 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8cf3f9ee2480613402c43f650705e4a292aca0d
-  data.tar.gz: df1d00eec5cf6f1693e94b3fd17454e83d9fc9bd
+  metadata.gz: 1561fe0dc4b71302bcf87ee76f15a7540e7d206a
+  data.tar.gz: 8ceb88c9af5f7b90ff7ef1c7b1b1c45f0b33071b
 SHA512:
-  metadata.gz: d9e7ef39e26e32d496d7df45dcc7a8c2492e8c352a38703362f3fefc408d500c7f6cabd07520faf6b6403c0f2963e9ad601a1b6bb861d13c010ce1a33b3f5f70
-  data.tar.gz: 472b1089dfe9d5a673547f24824f10e97ef557d412711b648d77612a98b40aa3ce8352550741a48aab2c89b736995b307e5caf33cf7ae67ead53ce55e4456110
+  metadata.gz: 555ed132c7f9af1fed838fc2f945794ab82dd5f483f8aa09de7b60fd5e07b5012d04cc997ef0f86533210294f0be91ee58b479fe71abf952a8a227bf0e369663
+  data.tar.gz: 3c009224cdb4943c75a45b159dec39a4838da97928ebaee1fd97b5f73ac949b0661aa2c3e6bffb782ab671a449895a6062100d14271d149f4c6bd368c1dbb67e

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 2.1.5

data/Gemfile.lock

@@ -1,16 +1,32 @@
 PATH
   remote: .
   specs:
-    ss_syntax (0.0.1)
+    ss_syntax (0.0.2)
       slop
 
 GEM
   remote: https://rubygems.org/
   specs:
+    diff-lcs (1.2.5)
+    rake (10.1.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
     slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
+  rspec (~> 3.1.0)
   ss_syntax!

data/README.md

@@ -1,4 +1,16 @@
 # ss記法
+[![Build Status](https://travis-ci.org/henteko/ss_syntax_rb.svg?branch=master)](https://travis-ci.org/henteko/ss_syntax_rb)
+
+## インストール
+
+```sh
+gem install ss_syntax
+
+# or
+
+gem 'ss_syntax'
+bundle install
+```
 
 ## 使い方
 
@@ -39,8 +51,12 @@ html = SsSyntax::SsSyntax.new(src, :html).parse()
 男: 今日は眠い
 1: 今日は眠い
 
+# 擬音も書ける
+1: 眠い :zzz
+
 # 結果
 # 男「今日は眠い」
+# 男「眠い」zzz
 ```
 
 ### 心の声
@@ -50,8 +66,12 @@ html = SsSyntax::SsSyntax.new(src, :html).parse()
 
 1_ 女は今日も可愛いなぁ
 
+# 擬音
+1_ わかる _ zzz
+
 # 結果
 # 男（女は今日も可愛いなぁ）
+# 男（わかる）zzz
 ```
 
 ### 地の文

data/Rakefile

@@ -0,0 +1,5 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/example/example.ss

@@ -7,4 +7,6 @@
 
 1: 小倉唯神
 2_ また男が変なこと言ってる…
-天使: それな
+天使: それな
+1: ねむい : zzz
+天使_ それな _ zzz

data/lib/ss_syntax/parse.rb

@@ -23,7 +23,8 @@ module SsSyntax
       html_text = ''
       @parse_text.each_line do |line|
         line.chomp!
-        html_text += "<span>#{line}</span><br />"
+        html_text += "<p>#{line}</p>" if line != ''
+        html_text += "<br />"
       end
 
       html_text
@@ -47,7 +48,7 @@ module SsSyntax
           when Parses::Type::Remark
             parse_text += Parses::Remark.get(line, @charactes) + "\n"
           when Parses::Type::None
-            parse_text += Parses::None.get(line) + "\n" if line != ''
+            parse_text += Parses::None.get(line) + "\n"
           else
             raise 'not support type'
         end

data/lib/ss_syntax/parses/character.rb

@@ -11,7 +11,7 @@ module SsSyntax
 
       def self.get(text)
         match = text.match(/^\* (.+) (.+)/) || text.match(/^- (.+) (.+)/)
-        return nil, nil if match == nil
+        return nil, nil if match == nil # TODO: raiseしてあげた方がいいかも
         return match[1], match[2]
       end
     end

data/lib/ss_syntax/parses/heart_voice.rb

@@ -10,11 +10,18 @@ module SsSyntax
       end
 
       def self.get(text, characters)
-        match = text.match(/(.+)_ (.+)/)
-        key, body = match[1], match[2]
+        key, body, gion = '', '', ''
 
-        return "#{characters[key]}（#{body}）" if characters[key] != nil
-        return "#{key}（#{body}）"
+        gion_match = text.match(/(.+)_ (.+) _ (.+)/) # with 擬音
+        if gion_match != nil
+          key, body, gion = gion_match[1], gion_match[2], gion_match[3]
+        else
+          match = text.match(/(.+)_ (.+)/)
+          key, body = match[1], match[2]
+        end
+
+        return "#{characters[key]}（#{body}）#{gion}" if characters[key] != nil
+        return "#{key}（#{body}）#{gion}"
       end
     end
   end

data/lib/ss_syntax/parses/remark.rb

@@ -10,11 +10,18 @@ module SsSyntax
       end
 
       def self.get(text, characters)
-        match = text.match(/(.+): (.+)/)
-        key, body = match[1], match[2]
+        key, body, gion = '', '', ''
 
-        return "#{characters[key]}「#{body}」" if characters[key] != nil
-        return "#{key}「#{body}」"
+        gion_match = text.match(/(.+): (.+) : (.+)/) # with 擬音
+        if gion_match != nil
+          key, body, gion = gion_match[1], gion_match[2], gion_match[3]
+        else
+          match = text.match(/(.+): (.+)/)
+          key, body = match[1], match[2]
+        end
+
+        return "#{characters[key]}「#{body}」#{gion}" if characters[key] != nil
+        return "#{key}「#{body}」#{gion}"
       end
     end
   end

data/lib/ss_syntax/version.rb

@@ -1,3 +1,3 @@
 module SsSyntax
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'ss_syntax'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.color = true
+end

data/spec/ss_syntax/parse_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe SsSyntax::Parse do
+
+  before do
+    @text = <<"EOS"
+* 1 hoge
+* 2 fuga
+
+# comment
+1: hoge
+2_ fuga
+EOS
+  end
+
+  describe '#to_s' do
+    it 'default' do
+      re_text = <<"EOS"
+
+hoge「hoge」
+fuga（fuga）
+EOS
+
+      expect(SsSyntax::Parse.new(@text).to_s).to eq re_text
+    end
+  end
+
+  describe '#to_h' do
+    it 'default' do
+      re_html = "<br /><p>hoge「hoge」</p><br /><p>fuga（fuga）</p><br />"
+
+      expect(SsSyntax::Parse.new(@text).to_h).to eq re_html
+    end
+  end
+
+end

data/spec/ss_syntax/parses/character_spec.rb

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+describe SsSyntax::Parses::Character do
+
+  describe 'self.check' do
+    context 'when character' do
+      it '*' do
+        expect(SsSyntax::Parses::Character.check('* hoge fuga')).to be_truthy
+        expect(SsSyntax::Parses::Character.check('* hoge')).to be_truthy
+      end
+
+      it '-' do
+        expect(SsSyntax::Parses::Character.check('- hoge fuga')).to be_truthy
+        expect(SsSyntax::Parses::Character.check('- hoge')).to be_truthy
+      end
+    end
+
+    context 'when not character' do
+      it 'comment' do
+        expect(SsSyntax::Parses::Character.check('# hoge')).to be_falsey
+      end
+
+      it 'heart voice' do
+        expect(SsSyntax::Parses::Character.check('1_ hoge')).to be_falsey
+      end
+
+      it 'remark' do
+        expect(SsSyntax::Parses::Character.check('1: hoge')).to be_falsey
+      end
+
+      it 'blank' do
+        expect(SsSyntax::Parses::Character.check('')).to be_falsey
+      end
+    end
+  end
+
+  describe 'self.get' do
+    context 'when character' do
+      before do
+        @cha  = 'hoge'
+        @cha2 = 'fuga'
+      end
+
+      it '*' do
+        expect(SsSyntax::Parses::Character.get("* #{@cha} #{@cha2}")).to match_array [@cha, @cha2]
+      end
+
+      it '-' do
+        expect(SsSyntax::Parses::Character.get("- #{@cha} #{@cha2}")).to match_array [@cha, @cha2]
+      end
+    end
+
+    context 'when nil' do
+      before do
+        @cha  = 'hoge'
+      end
+
+      it '*' do
+        expect(SsSyntax::Parses::Character.get("* #{@cha}")).to match_array [nil, nil]
+      end
+
+      it '-' do
+        expect(SsSyntax::Parses::Character.get("- #{@cha}")).to match_array [nil, nil]
+      end
+    end
+  end
+end

data/spec/ss_syntax/parses/comment_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe SsSyntax::Parses::Comment do
+
+  describe 'self.check' do
+    context 'when comment' do
+      it 'default' do
+        expect(SsSyntax::Parses::Comment.check('# hoge')).to be_truthy
+      end
+
+      it 'many #' do
+        expect(SsSyntax::Parses::Comment.check('## hoge ######')).to be_truthy
+      end
+    end
+
+    context 'when not comment' do
+      it 'default' do
+        expect(SsSyntax::Parses::Comment.check('hoge')).to be_falsey
+      end
+
+      it 'character' do
+        expect(SsSyntax::Parses::Comment.check('* hoge')).to be_falsey
+      end
+
+      it 'remark' do
+        expect(SsSyntax::Parses::Comment.check('1: hoge')).to be_falsey
+      end
+
+      it 'heart voice' do
+        expect(SsSyntax::Parses::Comment.check('1_ hoge')).to be_falsey
+      end
+    end
+  end
+
+end

data/spec/ss_syntax/parses/heart_voice_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe SsSyntax::Parses::HeartVoice do
+
+  describe 'self.check' do
+    context 'when heart voice' do
+      it 'default' do
+        expect(SsSyntax::Parses::HeartVoice.check('1_ hoge')).to be_truthy
+      end
+    end
+
+    context 'when not heart voice' do
+      it 'default' do
+        expect(SsSyntax::Parses::HeartVoice.check('hoge')).to be_falsey
+      end
+
+      it 'character' do
+        expect(SsSyntax::Parses::HeartVoice.check('* hoge')).to be_falsey
+      end
+
+      it 'comment' do
+        expect(SsSyntax::Parses::HeartVoice.check('# hoge')).to be_falsey
+      end
+
+      it 'remark' do
+        expect(SsSyntax::Parses::HeartVoice.check('1: hoge')).to be_falsey
+      end
+
+      it 'blank' do
+        expect(SsSyntax::Parses::HeartVoice.check('')).to be_falsey
+      end
+    end
+  end
+
+  describe 'self.get' do
+    before do
+      @characters = {
+          '1' => 'hoge'
+      }
+    end
+
+    context 'when remark' do
+      it 'default' do
+        text = '1_ hoge'
+        re_text = 'hoge（hoge）'
+        expect(SsSyntax::Parses::HeartVoice.get(text, @characters)).to eq re_text
+      end
+
+      it 'with gion' do
+        text = '1_ hoge _ zzz'
+        re_text = 'hoge（hoge）zzz'
+        expect(SsSyntax::Parses::HeartVoice.get(text, @characters)).to eq re_text
+      end
+
+      it 'not character' do
+        text = 'fuga_ hoge'
+        re_text = 'fuga（hoge）'
+        expect(SsSyntax::Parses::HeartVoice.get(text, @characters)).to eq re_text
+      end
+    end
+  end
+
+end

data/spec/ss_syntax/parses/none_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe SsSyntax::Parses::None do
+
+  describe 'self.check' do
+    context 'always return true' do
+      it 'blank' do
+        expect(SsSyntax::Parses::None.check('')).to be_truthy
+      end
+
+      it 'default' do
+        expect(SsSyntax::Parses::None.check('hoge')).to be_truthy
+      end
+    end
+  end
+
+  describe 'self.get' do
+    context 'always return text' do
+      it 'blank' do
+        text = ''
+        expect(SsSyntax::Parses::None.get(text)).to eq(text)
+      end
+
+      it 'default' do
+        text = 'hoge'
+        expect(SsSyntax::Parses::None.get(text)).to eq(text)
+      end
+    end
+  end
+
+end

data/spec/ss_syntax/parses/remark_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe SsSyntax::Parses::Remark do
+
+  describe 'self.check' do
+    context 'when remark' do
+      it 'default' do
+        expect(SsSyntax::Parses::Remark.check('1: hoge')).to be_truthy
+      end
+    end
+
+    context 'when not remark' do
+      it 'default' do
+        expect(SsSyntax::Parses::Remark.check('hoge')).to be_falsey
+      end
+
+      it 'character' do
+        expect(SsSyntax::Parses::Remark.check('* hoge')).to be_falsey
+      end
+
+      it 'comment' do
+        expect(SsSyntax::Parses::Remark.check('# hoge')).to be_falsey
+      end
+
+      it 'heart voice' do
+        expect(SsSyntax::Parses::Remark.check('1_ hoge')).to be_falsey
+      end
+
+      it 'blank' do
+        expect(SsSyntax::Parses::Remark.check('')).to be_falsey
+      end
+    end
+  end
+
+  describe 'self.get' do
+    before do
+      @characters = {
+          '1' => 'hoge'
+      }
+    end
+
+    context 'when remark' do
+      it 'default' do
+        text = '1: hoge'
+        re_text = 'hoge「hoge」'
+        expect(SsSyntax::Parses::Remark.get(text, @characters)).to eq re_text
+      end
+
+      it 'with gion' do
+        text = '1: hoge : zzz'
+        re_text = 'hoge「hoge」zzz'
+        expect(SsSyntax::Parses::Remark.get(text, @characters)).to eq re_text
+      end
+
+      it 'not character' do
+        text = 'fuga: hoge'
+        re_text = 'fuga「hoge」'
+        expect(SsSyntax::Parses::Remark.get(text, @characters)).to eq re_text
+      end
+    end
+  end
+
+end

data/ss_syntax.gemspec

@@ -13,7 +13,10 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
   s.add_dependency "slop"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", "~> 3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ss_syntax
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - henteko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: 
 email: henteko07@gmail.com
 executables:
@@ -32,9 +60,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/sssy
 - example/example.rb
 - example/example.ss
@@ -48,6 +78,13 @@ files:
 - lib/ss_syntax/parses/remark.rb
 - lib/ss_syntax/parses/type.rb
 - lib/ss_syntax/version.rb
+- spec/spec_helper.rb
+- spec/ss_syntax/parse_spec.rb
+- spec/ss_syntax/parses/character_spec.rb
+- spec/ss_syntax/parses/comment_spec.rb
+- spec/ss_syntax/parses/heart_voice_spec.rb
+- spec/ss_syntax/parses/none_spec.rb
+- spec/ss_syntax/parses/remark_spec.rb
 - ss_syntax.gemspec
 homepage: https://github.com/henteko/ss_syntax_rb
 licenses:
@@ -73,4 +110,11 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Short Story Syntax
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/ss_syntax/parse_spec.rb
+- spec/ss_syntax/parses/character_spec.rb
+- spec/ss_syntax/parses/comment_spec.rb
+- spec/ss_syntax/parses/heart_voice_spec.rb
+- spec/ss_syntax/parses/none_spec.rb
+- spec/ss_syntax/parses/remark_spec.rb