syllabize 0.5.0 → 0.6.0

data/README.md

@@ -20,9 +20,9 @@ Or install it yourself as:
 
 First, require `syllabize`. Then, you can call the `count_syllables` method on a string.
 
-```ruby
-require 'syllables'
-=> true
+```bash
+require 'syllabize'
+# => true
 'Ruby'.count_syllables
 # => 2
 ```

data/lib/syllabize.rb

@@ -1,12 +1,13 @@
 require 'yaml'
+require 'numbers_and_words'
 
 module Syllabize
 
   class Counter
-    attr_accessor :word, :exceptions_file
+    attr_accessor :str, :exceptions_file
 
-    def initialize(word)
-      @word = strip_punctuation(word)
+    def initialize(str)
+      @str = strip_punctuation(str)
       handle_non_string_input
       load_exceptions
     end
@@ -14,12 +15,14 @@ module Syllabize
     CONSONANTS = /[bcdfghjklmnpqrstvwxz]/i
     VOWELS = /[aeiou]/i
     LE_VOWEL_SOUND = /((le)\z)|((le(d|r|s))|(ling)\z)/i
-    DIPHTHONGS = /ou|ie|oo|oi|ea|ee|ai|ae|ay/i
+    DIPHTHONGS = /ou|ie|io|oa|oo|oi|ea|ee|ai|ae|ay/i
     Y_AS_VOWEL = /[^yY][yY]/
     RE_VOWEL = /(^re[aeiou])/i
 
     def count_syllables
-      return handle_exceptions if exceptions.keys.include?(word)
+      @str = str.to_i.to_words if is_int_in_string_form?
+      return break_into_words  if str.split(' ').length > 1
+      return handle_exceptions if exceptions.keys.include?(str)
       @syllables = count_vowels
       handle_additions
       handle_subtractions
@@ -28,18 +31,25 @@ module Syllabize
 
     private
 
-    # for Ruby 1.9
-    def __dir__
-      File.dirname(__FILE__)
-    end unless respond_to?(:__dir__, true)
+    def break_into_words
+      str.split(' ').collect(&:count_syllables).reduce(:+)
+    end
 
     def strip_punctuation(string)
       string.gsub(/\W/,'')
     end
 
+    def is_int_in_string_form?
+      str_as_int = str.to_i
+      if str_as_int.zero?
+        return str == '0' ? true : false
+      end
+      (str_as_int * str_as_int) > 0 ? true : false
+    end
+
     def handle_non_string_input
-      if !(word.is_a?(String))
-        raise ArgumentError.new "#{word} must be a string"
+      if !(str.is_a?(String))
+        raise ArgumentError.new "#{str} must be a string"
       end
     end
 
@@ -52,7 +62,7 @@ module Syllabize
     end
 
     def handle_exceptions
-      exceptions[word.to_s]
+      exceptions[str.to_s]
     end
 
     def handle_additions
@@ -68,15 +78,15 @@ module Syllabize
     end
 
     def count_vowels
-      word.scan(VOWELS).count
+      str.scan(VOWELS).count
     end
 
     def ends_in_silent_e?
-      word.downcase.each_char.to_a.last == 'e'
+      str.downcase.each_char.to_a.last == 'e'
     end
 
     def contains_le_vowel_sound?
-      word.scan(LE_VOWEL_SOUND).any?
+      str.scan(LE_VOWEL_SOUND).any?
     end
 
     def contains_non_initial_y?
@@ -84,24 +94,30 @@ module Syllabize
     end
 
     def count_ys_in_vowel_role
-      word.scan(Y_AS_VOWEL).size
+      str.scan(Y_AS_VOWEL).size
     end
 
     def begins_with_re_vowel?
-      word.scan(RE_VOWEL).any?
+      str.scan(RE_VOWEL).any?
     end
 
     def contains_diphthongs?
-      word.downcase.scan(DIPHTHONGS).any?
+      str.downcase.scan(DIPHTHONGS).any?
     end
 
     def count_diphthongs
-      word.downcase.scan(DIPHTHONGS).count
+      str.downcase.scan(DIPHTHONGS).count
     end
 
     def ends_in_sm?
-      word.end_with?('sm')
+      str.end_with?('sm')
     end
+
+
+    # for Ruby 1.9
+    def __dir__
+      File.dirname(__FILE__)
+    end unless respond_to?(:__dir__, true)
   end
 
 end

data/lib/syllabize/version.rb

@@ -1,3 +1,3 @@
 module Syllabize
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/lib/syllabize_spec.rb

@@ -4,7 +4,7 @@ class Syllabize::Counter
   public :count_vowels, :ends_in_silent_e?, :count_diphthongs,
          :contains_diphthongs?, :ends_in_sm?, :contains_non_initial_y?,
          :count_ys_in_vowel_role, :contains_le_vowel_sound?,
-         :begins_with_re_vowel?
+         :begins_with_re_vowel?, :is_int_in_string_form?
 end
 
 describe Syllabize::Counter do
@@ -16,6 +16,36 @@ describe Syllabize::Counter do
     end
   end
 
+  describe '#is_int_in_string_form?' do
+    subject { Syllabize::Counter.new(word).is_int_in_string_form? }
+    context 'is an int' do
+      context 'zero' do
+        let(:word) { '0' }
+        it 'returns true' do
+          expect(subject).to be_true
+        end
+      end
+      context 'positive' do
+        let(:word) { '500' }
+        it 'returns true' do
+          expect(subject).to be_true
+        end
+      end
+      context 'negative' do
+        let(:word) { '-10' }
+        it 'returns true' do
+          expect(subject).to be_true
+        end
+      end
+    end
+    context 'not an int' do
+      let(:word) { 'pizza' }
+      it 'returns false' do
+        expect(subject).to be_false
+      end
+    end
+  end
+
   describe '#ends_in_silent_e?' do
     context 'silent e' do
       it 'returns true if the word ends in a silent e' do
@@ -84,8 +114,8 @@ describe Syllabize::Counter do
 
   describe '#count_diphthongs' do
     it 'counts the diphthongs in a word' do
-      expect(Syllabize::Counter.new('air').count_diphthongs).to eq(1) 
-      expect(Syllabize::Counter.new('aerie').count_diphthongs).to eq(2) 
+      expect(Syllabize::Counter.new('air').count_diphthongs).to eq(1)
+      expect(Syllabize::Counter.new('aerie').count_diphthongs).to eq(2)
     end
   end
 
@@ -99,26 +129,31 @@ describe Syllabize::Counter do
     context 'given a string' do
       it 'counts the syllables in a word' do
         {
-          'blizzard'  => 2,
-          'why'       => 1,
-          'plain'     => 1,
-          'sticky'    => 2,
-          'syzygy'    => 3,
-          'yeses'     => 2,
-          'communism' => 4,
-          'please'    => 1,
-          'candle'    => 2,
-          'handling'  => 3,
-          'realize'   => 3,
-          'really'    => 2,
-          'cooperate' => 4,
-          'ways'      => 1,
-          "Wayne's"   => 1,
-          'basement'  => 2,
-          'basement,' => 2
+          'blizzard'          => 2,
+          'why'               => 1,
+          'plain'             => 1,
+          'sticky'            => 2,
+          'syzygy'            => 3,
+          'yeses'             => 2,
+          'communism'         => 4,
+          'please'            => 1,
+          'candle'            => 2,
+          'handling'          => 3,
+          'realize'           => 3,
+          'really'            => 2,
+          'cooperate'         => 4,
+          'ways'              => 1,
+          "Wayne's"           => 1,
+          'basement'          => 2,
+          'coach'             => 1,
+          'five'              => 1,
+          'hundred'           => 2,
+          'I really think so' => 5,
+          '500'               => 3,
+          '1,000,000'         => 3,
         }.each do |word, actual|
           count = Syllabize::Counter.new(word).count_syllables
-          expect(count).to eq(actual), "#{word} was not the correct number of syllables; expected #{actual}, was #{count}"
+          expect(count).to eq(actual), "'#{word}' was not the correct number of syllables; expected #{actual}, was #{count}"
         end
       end
     end

data/syllabize.gemspec

@@ -21,4 +21,5 @@ 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 "numbers_and_words"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syllabize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: numbers_and_words
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A syllable counter written in Ruby
 email:
 - nick@nickcox.me