ruby_speech 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b584064437c31f1d9a90af218c8624a69c4c5149
-  data.tar.gz: d60362174787e23a94d6ef4b11449d3cc655febb
+SHA256:
+  metadata.gz: 1e98208cd9f5203d85d2612483be8bfc76129aa07c355337a27031dc23170f2c
+  data.tar.gz: 91eeff37a2b0554849485ecc1717ac8f501dc056b1f1e5c9f4617f0fa103637c
 SHA512:
-  metadata.gz: ea4ced8154768936e7a3a3a7e580ecd1b7cabc0a949fa82f84eae374a17555d0974e4a6e29111fda0a9ea6f0878f27279f137ee15155f553d9a19e8a78813a90
-  data.tar.gz: 611147c468b4f36bb9cb6d1cbf3e760c055bf2a457e5db1209ce0fe6806171dbd319b90c1c6049fa7af17acbd69740bca0e9866d8e66a0f3ad3fb31da0d49e44
+  metadata.gz: 428108a63ca40aaab78165237b4d1bfeb12f7c2097bdc567a234c111b609a5450bfff09ec0e257c91a97405645a0acd8a1c7d5a90754a857d57a2849d4670c48
+  data.tar.gz: 158cf43762cf1fc1180edbf5f4acf28f263859d03801eb54b6a62fd05c1fdee9e1eee75b170aac6dee175a4b872a4adc27f8749e10b82779fd43d6348950bd8b

data/.gitignore

@@ -2,6 +2,7 @@
 *.gem
 *.bundle
 *.jar
+*.so
 Gemfile.lock
 pkg/*
 spec/reports

data/.travis.yml

@@ -1,27 +1,17 @@
 language: ruby
-
+rvm:
+  - 2.1.10
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - jruby-9.1.17.0
+  - jruby-head
+  - rbx-3
+  - ruby-head
+jdk:
+  - openjdk8 # for jruby
 matrix:
-  include:
-    - rvm: 1.9.3
-    - rvm: 2.0.0
-    - rvm: 2.1.0
-    - rvm: 2.2.0
-    - rvm: 2.3.0
-    - rvm: rbx-2
-    - rvm: rbx-3
-    - rvm: ruby-head
-    - rvm: jruby-1.7
-      jdk: openjdk7
-    - rvm: jruby-1.7
-      jdk: oraclejdk8
-    - rvm: jruby-head
-      jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
-      jdk: oraclejdk8
   allow_failures:
-    - rvm: rbx-2
     - rvm: rbx-3
     - rvm: ruby-head
 sudo: false
@@ -32,7 +22,5 @@ addons:
     - libpcre3-dev
 before_install:
   - gem install bundler
-env: JRUBY_OPTS="--server --debug -J-Xss1024k -J-Xmx652m -J-XX:+UseConcMarkSweepGC"
-
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/benlangfeld/ruby_speech)
 
+# [3.0.0](https://github.com/benlangfeld/ruby_speech/compare/v2.4.0...v3.0.0) - [2018-07-10](https://rubygems.org/gems/ruby_speech/versions/3.0.0)
+  * Feature: Loosen and bump Nokogiri version to ~>1.8, >=1.8.3
+  * Feature: Bump RSpec to 3.x and convert specs with Transpec
+
 # [2.4.0](https://github.com/benlangfeld/ruby_speech/compare/v2.3.2...v2.4.0) - [2018-02-23](https://rubygems.org/gems/ruby_speech/versions/2.4.0)
   * Feature: Permit percentage rate values for prosody tags
   * Bugfix: Rulerefs referenced n-levels deep under Rulerefs should be expanded.

data/README.md

@@ -30,8 +30,8 @@ sudo yum install pcre-devel
     gem install ruby_speech
 
 ## Ruby Version Compatability
-  * CRuby 1.9.3+ (1.9.2 is unofficially supported, but not regularly tested)
-  * JRuby 1.7+
+  * CRuby 2.1+
+  * JRuby 9.1+
 
 ## Library
 

data/Rakefile

@@ -25,6 +25,8 @@ if RUBY_PLATFORM =~ /java/
   require 'rake/javaextensiontask'
   Rake::JavaExtensionTask.new 'ruby_speech' do |ext|
     ext.lib_dir = 'lib/ruby_speech'
+    ext.source_version = '1.6'
+    ext.target_version = '1.6'
   end
 else
   require 'rake/extensiontask'

data/lib/ruby_speech/version.rb

@@ -1,3 +1,3 @@
 module RubySpeech
-  VERSION = "2.4.0"
+  VERSION = "3.0.0"
 end

data/ruby_speech.gemspec

@@ -27,15 +27,15 @@ Gem::Specification.new do |s|
     s.extensions = ['ext/ruby_speech/extconf.rb']
   end
 
-  s.add_runtime_dependency %q<nokogiri>, ["~> 1.6.0"]
+  s.add_runtime_dependency %q<nokogiri>, ["~> 1.8", ">= 1.8.3"]
   s.add_runtime_dependency %q<activesupport>, [">= 3.0.7", "< 5.0.0"]
 
   s.add_development_dependency %q<bundler>, [">= 1.0.0"]
-  s.add_development_dependency %q<rspec>, ["~> 2.99.0"]
+  s.add_development_dependency %q<rspec>, ["~> 3.0"]
   s.add_development_dependency %q<rspec-its>, [">= 0"]
   s.add_development_dependency %q<ci_reporter>, ["~> 1.6"]
   s.add_development_dependency %q<yard>, [">= 0.7.0"]
-  s.add_development_dependency %q<rake>, ["< 11.0"]
+  s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<guard>, [">= 0.9.0"]
   s.add_development_dependency %q<guard-rspec>, [">= 0"]
   s.add_development_dependency %q<listen>, ["< 3.1.0"]

data/spec/ruby_speech/grxml/builtins_spec.rb

@@ -4,22 +4,22 @@ describe RubySpeech::GRXML::Builtins do
   describe "boolean" do
     subject(:grammar) { described_class.boolean }
 
-    it { should max_match('1').and_interpret_as('true') }
-    it { should max_match('2').and_interpret_as('false') }
+    it { is_expected.to max_match('1').and_interpret_as('true') }
+    it { is_expected.to max_match('2').and_interpret_as('false') }
 
-    it { should not_match('0') }
-    it { should not_match('3') }
-    it { should not_match('10') }
+    it { is_expected.to not_match('0') }
+    it { is_expected.to not_match('3') }
+    it { is_expected.to not_match('10') }
 
     context "with the true/false digits parameterized" do
       subject { described_class.boolean y: 3, n: 7 }
 
-      it { should max_match('3').and_interpret_as('true') }
-      it { should max_match('7').and_interpret_as('false') }
+      it { is_expected.to max_match('3').and_interpret_as('true') }
+      it { is_expected.to max_match('7').and_interpret_as('false') }
 
-      it { should not_match('1') }
-      it { should not_match('2') }
-      it { should not_match('4') }
+      it { is_expected.to not_match('1') }
+      it { is_expected.to not_match('2') }
+      it { is_expected.to not_match('4') }
 
       context "both the same" do
         it "should raise ArgumentError" do
@@ -32,54 +32,54 @@ describe RubySpeech::GRXML::Builtins do
   describe "date" do
     subject(:grammar) { described_class.date }
 
-    it { should max_match('20130929').and_interpret_as('dtmf-2 dtmf-0 dtmf-1 dtmf-3 dtmf-0 dtmf-9 dtmf-2 dtmf-9') }
+    it { is_expected.to max_match('20130929').and_interpret_as('dtmf-2 dtmf-0 dtmf-1 dtmf-3 dtmf-0 dtmf-9 dtmf-2 dtmf-9') }
 
-    it { should potentially_match('130929') }
-    it { should potentially_match('0929') }
-    it { should potentially_match('29') }
-    it { should potentially_match('1') }
+    it { is_expected.to potentially_match('130929') }
+    it { is_expected.to potentially_match('0929') }
+    it { is_expected.to potentially_match('29') }
+    it { is_expected.to potentially_match('1') }
   end
 
   describe "digits" do
     subject(:grammar) { described_class.digits }
 
-    it { should match('1').and_interpret_as('dtmf-1') }
-    it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
-    it { should match('1').and_interpret_as('dtmf-1') }
+    it { is_expected.to match('1').and_interpret_as('dtmf-1') }
+    it { is_expected.to match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+    it { is_expected.to match('1').and_interpret_as('dtmf-1') }
 
     context "with a minimum length" do
       subject { described_class.digits minlength: 3 }
 
-      it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
-      it { should match('1234567890').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-4 dtmf-5 dtmf-6 dtmf-7 dtmf-8 dtmf-9 dtmf-0') }
+      it { is_expected.to match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+      it { is_expected.to match('1234567890').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-4 dtmf-5 dtmf-6 dtmf-7 dtmf-8 dtmf-9 dtmf-0') }
 
-      it { should potentially_match('1') }
-      it { should potentially_match('11') }
-      it { should potentially_match('4') }
+      it { is_expected.to potentially_match('1') }
+      it { is_expected.to potentially_match('11') }
+      it { is_expected.to potentially_match('4') }
     end
 
     context "with a maximum length" do
       subject { described_class.digits maxlength: 3 }
 
-      it { should match('1').and_interpret_as('dtmf-1') }
-      it { should match('12').and_interpret_as('dtmf-1 dtmf-2') }
-      it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+      it { is_expected.to match('1').and_interpret_as('dtmf-1') }
+      it { is_expected.to match('12').and_interpret_as('dtmf-1 dtmf-2') }
+      it { is_expected.to match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
 
-      it { should not_match('1111') }
-      it { should not_match('1111111') }
+      it { is_expected.to not_match('1111') }
+      it { is_expected.to not_match('1111111') }
     end
 
     context "with an absolute length" do
       subject { described_class.digits length: 3 }
 
-      it { should max_match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
-      it { should max_match('111').and_interpret_as('dtmf-1 dtmf-1 dtmf-1') }
+      it { is_expected.to max_match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+      it { is_expected.to max_match('111').and_interpret_as('dtmf-1 dtmf-1 dtmf-1') }
 
-      it { should potentially_match('1') }
-      it { should potentially_match('12') }
+      it { is_expected.to potentially_match('1') }
+      it { is_expected.to potentially_match('12') }
 
-      it { should not_match('1234') }
-      it { should not_match('12345') }
+      it { is_expected.to not_match('1234') }
+      it { is_expected.to not_match('12345') }
     end
 
     context "when the min and max lengths are swapped" do
@@ -104,71 +104,71 @@ describe RubySpeech::GRXML::Builtins do
   describe "currency" do
     subject(:grammar) { described_class.currency }
 
-    it { should max_match('1*01').and_interpret_as('dtmf-1 dtmf-star dtmf-0 dtmf-1') }
-    it { should max_match('01*00').and_interpret_as('dtmf-0 dtmf-1 dtmf-star dtmf-0 dtmf-0') }
-    it { should max_match('100000000000*00').and_interpret_as('dtmf-1 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-star dtmf-0 dtmf-0') }
-    it { should max_match('0*08').and_interpret_as('dtmf-0 dtmf-star dtmf-0 dtmf-8') }
-    it { should max_match('*59').and_interpret_as('dtmf-star dtmf-5 dtmf-9') }
+    it { is_expected.to max_match('1*01').and_interpret_as('dtmf-1 dtmf-star dtmf-0 dtmf-1') }
+    it { is_expected.to max_match('01*00').and_interpret_as('dtmf-0 dtmf-1 dtmf-star dtmf-0 dtmf-0') }
+    it { is_expected.to max_match('100000000000*00').and_interpret_as('dtmf-1 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-0 dtmf-star dtmf-0 dtmf-0') }
+    it { is_expected.to max_match('0*08').and_interpret_as('dtmf-0 dtmf-star dtmf-0 dtmf-8') }
+    it { is_expected.to max_match('*59').and_interpret_as('dtmf-star dtmf-5 dtmf-9') }
 
-    it { should match('0').and_interpret_as('dtmf-0') }
-    it { should match('0*0').and_interpret_as('dtmf-0 dtmf-star dtmf-0') }
-    it { should match('10*5').and_interpret_as('dtmf-1 dtmf-0 dtmf-star dtmf-5') }
-    it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
-    it { should match('123*').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-star') }
+    it { is_expected.to match('0').and_interpret_as('dtmf-0') }
+    it { is_expected.to match('0*0').and_interpret_as('dtmf-0 dtmf-star dtmf-0') }
+    it { is_expected.to match('10*5').and_interpret_as('dtmf-1 dtmf-0 dtmf-star dtmf-5') }
+    it { is_expected.to match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+    it { is_expected.to match('123*').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-star') }
 
-    it { should not_match('#') }
+    it { is_expected.to not_match('#') }
   end
 
   describe 'number' do
     subject(:grammar) { described_class.number }
 
-    it { should match('0').and_interpret_as 'dtmf-0' }
-    it { should match('123').and_interpret_as 'dtmf-1 dtmf-2 dtmf-3' }
-    it { should match('1*01').and_interpret_as dtmf_seq %w(1 star 0 1) }
-    it { should match('01*00').and_interpret_as dtmf_seq %w(0 1 star 0 0) }
+    it { is_expected.to match('0').and_interpret_as 'dtmf-0' }
+    it { is_expected.to match('123').and_interpret_as 'dtmf-1 dtmf-2 dtmf-3' }
+    it { is_expected.to match('1*01').and_interpret_as dtmf_seq %w(1 star 0 1) }
+    it { is_expected.to match('01*00').and_interpret_as dtmf_seq %w(0 1 star 0 0) }
     it do
-      should match('100000000000*00')
+      is_expected.to match('100000000000*00')
         .and_interpret_as dtmf_seq %w(1 0 0 0 0 0 0 0 0 0 0 0 star 0 0)
     end
-    it { should match('0*08').and_interpret_as dtmf_seq %w(0 star 0 8) }
-    it { should match('*59').and_interpret_as 'dtmf-star dtmf-5 dtmf-9' }
-    it { should match('0*0').and_interpret_as 'dtmf-0 dtmf-star dtmf-0' }
-    it { should match('10*5').and_interpret_as dtmf_seq %w(1 0 star 5) }
-    it { should match('123*').and_interpret_as dtmf_seq %w(1 2 3 star) }
+    it { is_expected.to match('0*08').and_interpret_as dtmf_seq %w(0 star 0 8) }
+    it { is_expected.to match('*59').and_interpret_as 'dtmf-star dtmf-5 dtmf-9' }
+    it { is_expected.to match('0*0').and_interpret_as 'dtmf-0 dtmf-star dtmf-0' }
+    it { is_expected.to match('10*5').and_interpret_as dtmf_seq %w(1 0 star 5) }
+    it { is_expected.to match('123*').and_interpret_as dtmf_seq %w(1 2 3 star) }
     it do
-      should match('123*2342').and_interpret_as dtmf_seq %w(1 2 3 star 2 3 4 2)
+      is_expected.to match('123*2342').and_interpret_as dtmf_seq %w(1 2 3 star 2 3 4 2)
     end
 
-    it { should potentially_match '*' }
+    it { is_expected.to potentially_match '*' }
 
-    it { should not_match '#' }
-    it { should not_match '**' }
-    it { should not_match '0123*456*789' }
+    it { is_expected.to not_match '#' }
+    it { is_expected.to not_match '**' }
+    it { is_expected.to not_match '0123*456*789' }
   end
 
   describe "phone" do
     subject(:grammar) { described_class.phone }
 
-    it { should match('0').and_interpret_as('dtmf-0') }
-    it { should match('0123').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3') }
-    it { should match('0123*456').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3 dtmf-star dtmf-4 dtmf-5 dtmf-6') }
+    it { is_expected.to match('0').and_interpret_as('dtmf-0') }
+    it { is_expected.to match('0123').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3') }
+    it { is_expected.to match('0123*456').and_interpret_as('dtmf-0 dtmf-1 dtmf-2 dtmf-3 dtmf-star dtmf-4 dtmf-5 dtmf-6') }
 
-    it { should potentially_match('') }
+    it { is_expected.to potentially_match('') }
 
-    it { should not_match('#') }
-    it { should not_match('0123*456*789') }
+    it { is_expected.to not_match('#') }
+    it { is_expected.to not_match('0123*456*789') }
   end
 
   describe "time" do
     subject(:grammar) { described_class.time }
 
-    it { should max_match('1235').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-5') }
+    it { is_expected.to max_match('1235').and_interpret_as('dtmf-1 dtmf-2 dtmf-3 dtmf-5') }
 
-    it { should match('12').and_interpret_as('dtmf-1 dtmf-2') }
-    it { should match('4').and_interpret_as('dtmf-4') }
-    it { should match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
+    it { is_expected.to match('12').and_interpret_as('dtmf-1 dtmf-2') }
+    it { is_expected.to match('4').and_interpret_as('dtmf-4') }
+    it { is_expected.to match('123').and_interpret_as('dtmf-1 dtmf-2 dtmf-3') }
 
-    it { should not_match('*') }
-    it { should not_match('#') }
+    it { is_expected.to not_match('*') }
+    it { is_expected.to not_match('#') }
   end
 end

data/spec/ruby_speech/grxml/grammar_spec.rb

@@ -7,7 +7,7 @@ module RubySpeech
 
       subject { described_class.new doc }
 
-      it { should be_a_valid_grxml_document }
+      it { is_expected.to be_a_valid_grxml_document }
 
       its(:name)      { should == 'grammar' }
       its(:language)  { should == 'en-US' }
@@ -36,7 +36,7 @@ module RubySpeech
       end
 
       it 'registers itself' do
-        Element.class_from_registration(:grammar).should == Grammar
+        expect(Element.class_from_registration(:grammar)).to eq(Grammar)
       end
 
       describe "from a document" do
@@ -48,7 +48,7 @@ module RubySpeech
 
         subject { Element.import document }
 
-        it { should be_instance_of Grammar }
+        it { is_expected.to be_instance_of Grammar }
 
         its(:language)  { should == 'jp' }
         its(:base_uri)  { should == 'blah' }
@@ -70,24 +70,24 @@ module RubySpeech
 
       describe "comparing objects" do
         it "should be equal if the content, language and base uri are the same" do
-          Grammar.new(doc, :language => 'en-GB', :base_uri => 'blah', :content => "Hello there").should == Grammar.new(doc, :language => 'en-GB', :base_uri => 'blah', :content => "Hello there")
+          expect(Grammar.new(doc, :language => 'en-GB', :base_uri => 'blah', :content => "Hello there")).to eq(Grammar.new(doc, :language => 'en-GB', :base_uri => 'blah', :content => "Hello there"))
         end
 
         describe "when the content is different" do
           it "should not be equal" do
-            Grammar.new(doc, :content => "Hello").should_not == Grammar.new(doc, :content => "Hello there")
+            expect(Grammar.new(doc, :content => "Hello")).not_to eq(Grammar.new(doc, :content => "Hello there"))
           end
         end
 
         describe "when the language is different" do
           it "should not be equal" do
-            Grammar.new(doc, :language => 'en-US').should_not == Grammar.new(doc, :language => 'en-GB')
+            expect(Grammar.new(doc, :language => 'en-US')).not_to eq(Grammar.new(doc, :language => 'en-GB'))
           end
         end
 
         describe "when the base URI is different" do
           it "should not be equal" do
-            Grammar.new(doc, :base_uri => 'foo').should_not == Grammar.new(doc, :base_uri => 'bar')
+            expect(Grammar.new(doc, :base_uri => 'foo')).not_to eq(Grammar.new(doc, :base_uri => 'bar'))
           end
         end
 
@@ -98,7 +98,7 @@ module RubySpeech
             g2 = Grammar.new doc
             g2 << Rule.new(doc, :id => 'main2')
 
-            g1.should_not == g2
+            expect(g1).not_to eq(g2)
           end
         end
       end
@@ -108,32 +108,32 @@ module RubySpeech
         g.rule :id => :main, :scope => 'public'
         expected_g = Grammar.new doc
         expected_g << Rule.new(doc, :id => :main, :scope => 'public')
-        g.should == expected_g
+        expect(g).to eq(expected_g)
       end
 
       describe "<<" do
         it "should accept Rule" do
-          lambda { subject << Rule.new(doc) }.should_not raise_error
+          expect { subject << Rule.new(doc) }.not_to raise_error
         end
 
         it "should accept Tag" do
-          lambda { subject << Tag.new(doc) }.should_not raise_error
+          expect { subject << Tag.new(doc) }.not_to raise_error
         end
 
         it "should raise InvalidChildError with non-acceptable objects" do
-          lambda { subject << 1 }.should raise_error(InvalidChildError, "A Grammar can only accept Rule and Tag as children")
+          expect { subject << 1 }.to raise_error(InvalidChildError, "A Grammar can only accept Rule and Tag as children")
         end
       end
 
       describe "#to_doc" do
         it "should create an XML document from the grammar" do
-          subject.to_doc.should == subject.document
+          expect(subject.to_doc).to eq(subject.document)
         end
       end
 
       describe "#tag_format" do
         it "should allow setting tag-format identifier" do
-          lambda { subject.tag_format = "semantics/1.0" }.should_not raise_error
+          expect { subject.tag_format = "semantics/1.0" }.not_to raise_error
         end
       end
 
@@ -152,11 +152,11 @@ module RubySpeech
           expected_concat << Rule.new(doc, :id => 'millie', :scope => 'public', :content => "Hi Millie")
 
           concat = grammar1 + grammar2
-          grammar1.to_s.should == grammar1_string
-          grammar2.to_s.should == grammar2_string
-          concat.should == expected_concat
-          concat.document.root.should == concat
-          concat.to_s.should_not include('default')
+          expect(grammar1.to_s).to eq(grammar1_string)
+          expect(grammar2.to_s).to eq(grammar2_string)
+          expect(concat).to eq(expected_concat)
+          expect(concat.document.root).to eq(concat)
+          expect(concat.to_s).not_to include('default')
         end
       end
 
@@ -167,7 +167,7 @@ module RubySpeech
         foo = GRXML::Rule.new doc, :id => 'foo'
         grammar << foo
 
-        grammar.root_rule.should == foo
+        expect(grammar.root_rule).to eq(foo)
       end
 
       describe "inlining rule references" do
@@ -224,13 +224,13 @@ module RubySpeech
         end
 
         it "should be possible in a non-destructive manner" do
-          grammar.inline.should == inline_grammar
-          grammar.should_not == inline_grammar
+          expect(grammar.inline).to eq(inline_grammar)
+          expect(grammar).not_to eq(inline_grammar)
         end
 
         it "should be possible in a destructive manner" do
-          grammar.inline!.should == inline_grammar
-          grammar.should == inline_grammar
+          expect(grammar.inline!).to eq(inline_grammar)
+          expect(grammar).to eq(inline_grammar)
         end
 
         context 'nested' do
@@ -254,7 +254,7 @@ module RubySpeech
               end.inline
             end
 
-            it { should eq expected_doc }
+            it { is_expected.to eq expected_doc }
           end
 
           context '2 levels deep' do
@@ -272,7 +272,7 @@ module RubySpeech
               end.inline
             end
 
-            it { should eq expected_doc }
+            it { is_expected.to eq expected_doc }
           end
 
           context '3 levels deep' do
@@ -293,7 +293,7 @@ module RubySpeech
               end.inline
             end
 
-            it { should eq expected_doc }
+            it { is_expected.to eq expected_doc }
           end
 
           context 'in a self-referencial infinite loop' do
@@ -393,7 +393,7 @@ module RubySpeech
           let(:tokens)  { 'hello' }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -402,7 +402,7 @@ module RubySpeech
           let(:tokens)  { ['2'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -411,7 +411,7 @@ module RubySpeech
           let(:tokens)  { ['San Francisco'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -420,7 +420,7 @@ module RubySpeech
           let(:tokens)  { ['hello'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -429,7 +429,7 @@ module RubySpeech
           let(:tokens)  { ['bon', 'voyage'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -438,7 +438,7 @@ module RubySpeech
           let(:tokens)  { ['this', 'is', 'a', 'test'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -447,7 +447,7 @@ module RubySpeech
           let(:tokens)  { ['San Francisco'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
 
@@ -462,7 +462,7 @@ module RubySpeech
           let(:tokens) { ['Welcome', 'to', 'San Francisco', 'Have Fun!'] }
 
           it "should tokenize correctly" do
-            should == tokenized_version
+            is_expected.to eq(tokenized_version)
           end
         end
       end
@@ -483,9 +483,9 @@ module RubySpeech
             end
           end
 
-          grammar.should_not == normalized_grammar
+          expect(grammar).not_to eq(normalized_grammar)
           grammar.normalize_whitespace
-          grammar.should == normalized_grammar
+          expect(grammar).to eq(normalized_grammar)
         end
       end
     end # Grammar