HyakuninIssyu 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4245b17c96084fa90ad6d0cfb7646b07d98e08
-  data.tar.gz: a32b9d40fb472ef130786a39d7e930ae893ce7f3
+  metadata.gz: 065f4bd1f89054fe5c8c6425feec6b66ce0bf7d1
+  data.tar.gz: 57cbe12266bd96c0106c0c68731572a078b3eb91
 SHA512:
-  metadata.gz: 7c5b03e49db98323b2693f32d8428e347296377ebcac79ed08015bf4f6c53d07d3b2793734ab77ea0a91fcc4e3b7b9bd961378528fdedf4310aced5e3b77c52b
-  data.tar.gz: 45a5b5c68da766c18576976f7db8e62e57927d8745e138e3fb8100f6eaa18d6abc81d0088019aa0377a125cf53c00a2e97bf37473abe391de1376159e120ca23
+  metadata.gz: f3ad79fe58cd84d2b30a807a97ddf7ffb2d9e5f2241967b73396b1cb535ea16f58808ba3d82f4b3a0ab92b4dae5482e63a4ec74b17fe1a4079f2ada1fdabb17a
+  data.tar.gz: 0481f021dcff5544cc954ea44054bdcd6fb2be9a88102a660708f02fb459ed8353ecee164c12bbce5bcc10e96822842e956fb60a715448b294cf4b4120cceb48

data/.travis.yml

@@ -6,3 +6,4 @@ gemfile:
 branches:
   only:
     - master
+    - develop

data/HyakuninIssyu.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "moji"
   spec.add_development_dependency "coveralls"
 end

data/lib/HyakuninIssyu.rb

@@ -2,7 +2,8 @@ require "HyakuninIssyu/version"
 require "yaml"
 
 class HyakuninIssyu
-	def initialize(id=nil)
+	def initialize(id=1)
+		return false if id<1 || id>100
 		@poem = Poem.new(id)
 		@poet = Poet.new(id)
 	end
@@ -16,9 +17,9 @@ class HyakuninIssyu
 	end
 
 	class Poem
-		def initialize(id=nil)
+		def initialize(id)
 			@poems = YAML.load_file(File.expand_path(File.join('..', 'data', 'poems.yml'), __FILE__))
-			@poem = id ? @poems[id-1] : @poems[0]
+			@poem = @poems[id-1]
 		end
 
 		def id
@@ -115,9 +116,9 @@ class HyakuninIssyu
 	end
 
 	class Poet
-		def initialize(id=nil)
+		def initialize(id)
 			@poets = YAML.load_file(File.expand_path(File.join('..', 'data', 'poets.yml'), __FILE__))
-			@poet = id ? @poets[id-1] : @poets[0]
+			@poet = @poets[id-1]
 		end
 
 		def id

data/lib/HyakuninIssyu/version.rb

@@ -1,3 +1,3 @@
 class HyakuninIssyu
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/hyakuninissyu_spec.rb

@@ -1,64 +1,258 @@
 require "spec_helper.rb"
 
 describe HyakuninIssyu do
-	describe 'poem with particular poem id' do
-		before do
-			@id = rand(100)+1
-			@test_poem = HyakuninIssyu.new(@id)
+	describe 'Poem' do
+		before { @poems = YAML.load_file(File.expand_path(File.join('..', '..', 'lib', 'data', 'poems.yml'), __FILE__)) }
 
-			@poems = YAML.load_file(File.expand_path(File.join('..', '..', 'lib', 'data', 'poems.yml'), __FILE__))
-			@poets = YAML.load_file(File.expand_path(File.join('..', '..', 'lib', 'data', 'poets.yml'), __FILE__))
+		describe '#id?' do
+			context 'when provided proper id' do
+				before { @poem = HyakuninIssyu.new(3) }
+				it {
+					@poem.poem.id.should be_true
+				}
+			end
+
+			context 'when provided unproper id' do
+				before { @poem = HyakuninIssyu.new(101) }
+				it {
+					@poem.poem.should be_false
+				}
+			end
+
+			context 'when provided no id' do
+				before { @poem = HyakuninIssyu.new }
+				it {
+					@poem.poem.id.should be_true
+				}
+
+				it {
+					@poem.poem.id.should eq(1)
+				}
+			end
 		end
 
-		it "should return poem" do
-			@test_poem.poem.kanji.should_not be_nil
+		describe '#list' do
+			before { @poem = HyakuninIssyu.new }
+			it {
+				@poem.poem.list.should have(100).items
+			}
 		end
 
-		it "should return poet" do
-			@test_poem.poet.name.ja.should_not be_nil
+		context 'when showing full part' do
+			before { @poem = HyakuninIssyu.new(10) }
+
+			describe '#kana' do
+				it {
+					@poem.poem.kana.should include_kana
+				}
+
+				it {
+					@poem.poem.kana.split(//u).size.should eq(32)
+				}
+			end
+
+			describe '#kanji' do
+				it {
+					@poem.poem.kanji.should include_kanji
+				}
+
+				it {
+					@poem.poem.kanji.split(/ /).size.should eq(5)
+				}
+			end
+
+			describe '#en' do
+				it {
+					@poem.poem.en.should be_english
+				}
+			end
+
+			describe '#comment' do
+				it {
+					@poem.poem.comment.should include_kanji
+				}
+			end
+
 		end
 
-		it "should return correct poem" do
-			correct_poem = @poems[@id-1]["poem"]["kanji"]
-			@test_poem.poem.kanji.should eq(correct_poem)
+		context 'when showing the first part' do
+			describe '#kana' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.first.kana.should include_kana
+				}
+
+				it {
+					@poem.poem.first.kana.split(//u).size.should eq(17)
+				}
+			end
+
+			describe '#kanji' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.first.kanji.should include_kanji
+				}
+			end
+
+			describe '#en' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.first.en.should be_english
+				}
+			end
 		end
 
-		it "should return correct poet" do
-			correct_poet = @poets[@id-1]["name"]["ja"]
-			@test_poem.poet.name.ja.should eq(correct_poet)
+		context 'when showing the last part' do
+			describe '#kana' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.last.kana.should include_kana
+				}
+
+				it {
+					@poem.poem.last.kana.split(//u).size.should eq(14)
+				}
+			end
+
+			describe '#kanji' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.last.kanji.should include_kanji
+				}
+			end
+
+			describe '#en' do
+				before { @poem = HyakuninIssyu.new(10) }
+				it {
+					@poem.poem.last.en.should be_english
+				}
+			end
 		end
+	end
+
+	describe 'Poet' do
+		before { @poets = YAML.load_file(File.expand_path(File.join('..', '..', 'lib', 'data', 'poets.yml'), __FILE__)) }
+
+		describe '#id?' do
+			context 'when provided proper id' do
+				before { @poet = HyakuninIssyu.new(3) }
+				it {
+					@poet.poet.id.should be_true
+				}
+			end
+
+			context 'when provided unproper id' do
+				before { @poet = HyakuninIssyu.new(101) }
+				it {
+					@poet.poet.should be_false
+				}
+			end
 
-		it "should return first half of poem" do
-			first = @test_poem.poem.first.kanji
-			first.should_not be_nil
+			context 'when provided no id' do
+				before { @poet = HyakuninIssyu.new }
+				it {
+					@poet.poet.id.should be_true
+				}
+
+				it {
+					@poet.poet.id.should eq(1)
+				}
+			end
 		end
 
-		it "should return last half of poem" do
-			last = @test_poem.poem.last.kanji
-			last.should_not be_nil
+		describe '#list' do
+			before { @poet = HyakuninIssyu.new }
+			it {
+				@poet.poet.list.should have(100).items
+			}
 		end
 
-		it "should return kana without first/last option" do
-			kana = @test_poem.poem.kana
-			kana.should_not be_nil
+		describe '#name' do
+			before { @poet = HyakuninIssyu.new }
+
+			describe '#ja' do
+				it {
+					@poet.poet.name.ja.should include_kanji
+				}
+			end
+
+			describe '#en' do
+				it {
+					@poet.poet.name.en.should be_english
+				}
+			end
 		end
-	end
 
-	describe 'poem without any particular ids' do
-		before do
-			@test_poem = HyakuninIssyu.new
+		describe '#period' do
+			before { @poet = HyakuninIssyu.new }
+			it {
+				@poet.poet.period.should match(/-/)
+			}
 		end
 
-		it "should return poem[0]" do
-			@test_poem.poem.kanji.should eq('秋の田の かりほの庵の 苫をあらみ わが衣手は 露にぬれつつ')
+		describe '#male?' do
+			context 'when poet is male' do
+				before { @poet = HyakuninIssyu.new(1) }
+				it {
+					@poet.poet.male?.should be_true
+				}
+			end
+
+			context 'when poet is female' do
+				before { @poet = HyakuninIssyu.new(2) }
+				it {
+					@poet.poet.male?.should be_false
+				}
+			end
 		end
 
-		it "should return the list of all poems" do
-			@test_poem.poem.list.size.should eq(100)
+		describe '#female?' do
+			context 'when poet is male' do
+				before { @poet = HyakuninIssyu.new(1) }
+				it {
+					@poet.poet.female?.should be_false
+				}
+			end
+
+			context 'when poet is female' do
+				before { @poet = HyakuninIssyu.new(2) }
+				it {
+					@poet.poet.female?.should be_true
+				}
+			end
 		end
 
-		it "should return the list of all poets" do
-			@test_poem.poet.list.size.should eq(100)
+		describe '#monk?' do
+			context 'when poet is monk' do
+				before { @poet = HyakuninIssyu.new(8) }
+				it {
+					@poet.poet.monk?.should be_true
+				}
+			end
+
+			context 'when poet is not monk' do
+				before { @poet = HyakuninIssyu.new(1) }
+				it {
+					@poet.poet.monk?.should be_false
+				}
+			end
+		end
+
+		describe '#semimaru?' do
+			context 'when poet is semimaru' do
+				before { @poet = HyakuninIssyu.new(10) }
+				it {
+					@poet.poet.semimaru?.should be_true
+				}
+			end
+
+			context 'when poet is not semimaru' do
+				before { @poet = HyakuninIssyu.new(1) }
+				it {
+					@poet.poet.semimaru?.should be_false
+				}
+			end
 		end
 	end
 end
+

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "bundler/setup"
 require "HyakuninIssyu"
+require "moji"
 require 'coveralls'
 Coveralls.wear!
 
@@ -8,3 +9,28 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
 end
 
+RSpec::Matchers.define :include_kanji do |channel, expected_message|
+  match do |str|
+		result = false
+		str.split(//u).each do |char|
+			result = true if Moji.type?(char, Moji::ZEN_KANJI)
+		end
+		result
+  end
+end
+
+RSpec::Matchers.define :include_kana do |channel, expected_message|
+  match do |str|
+		result = false
+		str.split(//u).each do |char|
+			result = true if Moji.type?(char, Moji::ZEN_HIRA)
+		end
+		result
+  end
+end
+
+RSpec::Matchers.define :be_english do |channel, expected_message|
+  match do |str|
+		Moji.type?(str, Moji::HAN)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HyakuninIssyu
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - tomomichi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: moji
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement