ikku 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fad5f8882e7062dc3e4cdd954a07a07c332a86d
-  data.tar.gz: 886dfe82a320a73477f9dfff09717823e7c80cda
+  metadata.gz: 35d7cad5cfe61dfda39ba6567212579890d1c563
+  data.tar.gz: d7cafd5b2e597c4afec2a551008f99bb6759e857
 SHA512:
-  metadata.gz: 2a1bf91e575a441add860f54a169fc4b8e8831561ade68488e9fb0535326c7005b31ba6f0c14a934dce8e9595d7a43c17cf85709d75a5e627825a3e896e979db
-  data.tar.gz: cee5602f834f94b46077e570ec3788353e7c88b6b6bbe023938d26a5fd4f6951f9e0ba92a4ae01aa5276cc8b29629fae3f5ee5d3a9739be9afd5a8540c07ddb3
+  metadata.gz: c481b9f2715cc245851ae632ad516fcc605dc741303e2500ce1bdf8218b3b3d154f5fa90e58ae69a4dec484a76e8bf8189adb119eedb042025e0f2262f6ef1d9
+  data.tar.gz: adb112fa8c71523c58cbdcf26802b60ea0023a252cfb6b8e3119e3a7249fb9abb988412341e6b2039226a7b0a292cd45b59a527308dfd9271da5afe4898da271

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+- Don't allow song ending with サ変・スル in 連用形 (-し)
+- Don't allow song ending with 動詞 in 仮定形
+
 ## 0.1.1
 - Fix bracket bug
 
@@ -9,7 +13,7 @@
 - Don't allow ikku ending with 連用タ接続
 
 ## 0.0.8
-- Don't allow ikku starting with no pronounciation length node
+- Don't allow ikku starting with no pronunciation length node
 
 ## 0.0.7
 - Don't allow phrase ending with 接頭辞

data/README.md

@@ -42,7 +42,7 @@ reviewer.search("ああ古池や蛙飛び込む水の音ああ天秤や京江戸
 ```
 
 ### Ikku::Song#phrases
-Returns an Array of phrases of `Ikku::Node`.
+Return an Array of phrases of `Ikku::Node`.
 
 ```rb
 song.phrases #=> [["古池", "や"], ["蛙", "飛び込む"], ["水", "の", "音"]]

data/lib/ikku/node.rb

@@ -74,6 +74,10 @@ module Ikku
         false
       when conjugation2 == "連用タ接続"
         false
+      when conjugation1 == "サ変・スル" && conjugation2 == "連用形"
+        false
+      when type == "動詞" && conjugation2 == "仮定形"
+        false
       else
         true
       end
@@ -87,23 +91,23 @@ module Ikku
       stat == STAT_ID_FOR_NORMAL
     end
 
-    def pronounciation
+    def pronunciation
       feature[8]
     end
 
-    def pronounciation_length
-      @pronounciation_length ||= begin
-        if pronounciation
-          pronounciation_mora.length
+    def pronunciation_length
+      @pronunciation_length ||= begin
+        if pronunciation
+          pronunciation_mora.length
         else
           0
         end
       end
     end
 
-    def pronounciation_mora
-      if pronounciation
-        pronounciation.tr("ぁ-ゔ","ァ-ヴ").gsub(/[^アイウエオカ-モヤユヨラ-ロワヲンヴー]/, "")
+    def pronunciation_mora
+      if pronunciation
+        pronunciation.tr("ぁ-ゔ","ァ-ヴ").gsub(/[^アイウエオカ-モヤユヨラ-ロワヲンヴー]/, "")
       end
     end
 

data/lib/ikku/scanner.rb

@@ -9,7 +9,7 @@ module Ikku
       @rule = rule
     end
 
-    # @note Pronounciation count
+    # @note Pronunciation count
     def count
       @count ||= 0
     end
@@ -33,18 +33,18 @@ module Ikku
 
     def consume(node)
       case
-      when node.pronounciation_length > max_consumable_length
+      when node.pronunciation_length > max_consumable_length
         false
       when !node.element_of_ikku?
         false
       when first_of_phrase? && !node.first_of_phrase?
         false
-      when node.pronounciation_length == max_consumable_length && !node.last_of_phrase?
+      when node.pronunciation_length == max_consumable_length && !node.last_of_phrase?
         false
       else
         phrases[phrase_index] ||= []
         phrases[phrase_index] << node
-        self.count += node.pronounciation_length
+        self.count += node.pronunciation_length
         true
       end
     end

data/lib/ikku/version.rb

@@ -1,3 +1,3 @@
 module Ikku
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/ikku/reviewer_spec.rb

@@ -45,6 +45,14 @@ RSpec.describe Ikku::Reviewer do
 
       it { is_expected.to be_nil }
     end
+
+    context "with song ending with 仮定形" do
+      let(:text) do
+        "その人に金をあげたい人がいれば"
+      end
+
+      it { is_expected.to be_nil }
+    end
   end
 
   describe "#judge" do
@@ -147,6 +155,14 @@ RSpec.describe Ikku::Reviewer do
 
       it { is_expected.to be true }
     end
+
+    context "with song ending with サ変・スル in 連用形 (-し)" do
+      let(:text) do
+        "炊きつけて画面眺めて満足し"
+      end
+
+      it { is_expected.to be false }
+    end
   end
 
   describe "#search" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ikku
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: natto