saper 0.5.2 → 0.5.3

data/spec/core/result_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe Saper::Result do
+RSpec.describe Saper::Result do
   
   it # TODO
   

data/spec/core/runtime_spec.rb

@@ -1,34 +1,52 @@
 require './spec/spec_helper'
 
-describe Saper::Runtime do
+RSpec.describe Saper::Runtime do
   let :subject do
     Saper::Runtime.new
   end
-  it "#browser returns Browser instance" do
-    subject.browser.must_be_kind_of(Saper::Browser)
-  end
-  it "#bytes_received returns zero by default" do
-    subject.bytes_received.must_equal 0
-  end
-  it "#bytes_sent returns zero by default" do
-    subject.bytes_sent.must_equal 0
-  end
-  it "#http_requests returns zero by default" do
-    subject.http_requests.must_equal 0
-  end
-  it "#keychain returns Keychain instance" do
-    subject.keychain.must_be_kind_of(Saper::Keychain)
-  end
-  it "#credentials returns empty hash if service not found" do
-    subject.credentials(:services).must_equal({})
-  end
-  it "#[] returns nil if variable is not defined" do
-    subject[:varname].must_be_nil
-  end
-  it "#[]= stores variale value" do
-    Saper::Runtime.new { |r| r[:var] = 'A' }[:var].must_equal 'A'
-  end
-  it "#variables returns list of variable names" do
-    Saper::Runtime.new { |r| r[:var] = 'B' }.variables.must_equal({ :var => 'B' })
+  context "#browser" do
+    it "returns Browser instance" do
+      expect(subject.browser).to be_a(Saper::Browser)
+    end
+  end
+  context "#bytes_received" do
+    it "returns zero by default" do
+      expect(subject.bytes_received).to eq 0
+    end
+  end
+  context "#bytes_sent" do
+    it "returns zero by default" do
+      expect(subject.bytes_sent).to eq 0
+    end
+  end
+  context "#http_requests" do
+    it "returns zero by default" do
+      expect(subject.http_requests).to eq 0
+    end
+  end
+  context "#keychain" do
+    it "returns Keychain instance" do
+      expect(subject.keychain).to be_a Saper::Keychain
+    end
+  end
+  context "#credentials" do
+    it "returns empty hash if service not found" do
+      expect(subject.credentials(:services)).to eq({})
+    end
+  end
+  context "#[]" do
+    it "returns nil if variable is not defined" do
+      expect(subject[:varname]).to be_nil
+    end
+  end
+  context "#[]=" do
+    it "stores variale value" do
+      expect(Saper::Runtime.new { |r| r[:var] = 'A' }[:var]).to eq 'A'
+    end
+  end
+  context "#variables" do
+    it "returns list of variable names" do
+      expect(Saper::Runtime.new { |r| r[:var] = 'B' }.variables).to eq({ :var => 'B' })
+    end
   end
 end

data/spec/core/stack_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe Saper::Stack do
+RSpec.describe Saper::Stack do
 
   it # TODO
   

data/spec/core/type_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe Saper::Type do
+RSpec.describe Saper::Type do
 
   it # TODO
   

data/spec/integration/simple_invalid_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe "Simple Invalid Recipe" do
+RSpec.describe "Simple Invalid Recipe" do
   let :recipe do
     Saper::Recipe.parse do
       set_input "<p>one</p><p>two</p>"
@@ -13,27 +13,64 @@ describe "Simple Invalid Recipe" do
     recipe.run
   end
   it "returns Result" do
-    result.must_be_instance_of(Saper::Result)
+    expect(result).to be_a Saper::Result
   end
   it "#multiple? returns false" do
-    result.wont_be :multiple?
+    expect(result).to_not be_multiple
   end
   it "#success? returns false" do
-    result.wont_be :success?
+    expect(result).to_not be_success
   end
   it "#failure? returns true" do
-    result.must_be :failure?
+    expect(result).to be_failure
   end
   it "#size returns 1" do
-    result.size.must_equal 1
+    expect(result.size).to eq 1
   end
   it "#to_native returns nil" do
-    result.to_native.must_be_nil
+    expect(result.to_native).to be_nil
   end
   it "#to_saper returns Saper::Items::Nothing" do
-    result.to_saper.must_be_instance_of Saper::Items::Nothing
+    expect(result.to_saper).to be_a Saper::Items::Nothing
   end
   it "#to_json returns valid String" do
-    result.to_json.must_equal 'null'
+    expect(result.to_json).to eq 'null'
+  end
+end
+
+RSpec.describe "Simple Invalid Recipe" do
+  let :recipe do
+    Saper::Recipe.parse do
+      set_input "<p>one</p><p>two</p>"
+      convert_to_html
+      find "a"
+    end
+  end
+  let :result do
+    recipe.run
+  end
+  it "returns Result" do
+    expect(result).to be_a Saper::Result
+  end
+  it "#multiple? returns false" do
+    expect(result).to_not be_multiple
+  end
+  it "#success? returns false" do
+    expect(result).to_not be_success
+  end
+  it "#failure? returns true" do
+    expect(result).to be_failure
+  end
+  it "#size returns 1" do
+    expect(result.size).to eq 1
+  end
+  it "#to_native return nil" do
+    expect(result.to_native).to be_nil
+  end
+  it "#to_saper returns nil" do
+    expect(result.to_saper).to be_nil
+  end
+  it "#to_json returns valid JSON" do
+    expect(result.to_json).to eq 'null'
   end
 end

data/spec/integration/simple_valid_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe "Simple Valid Recipe" do
+RSpec.describe "Simple Valid Recipe" do
   let :recipe do
     Saper::Recipe.parse do
       set_input "<p>one</p><p>two</p>"
@@ -13,27 +13,27 @@ describe "Simple Valid Recipe" do
     recipe.run
   end
   it "returns Result" do
-    result.must_be_instance_of(Saper::Result)
+    expect(result).to be_a Saper::Result
   end
   it "#multiple? returns true" do
-    result.must_be :multiple?
+    expect(result).to be_multiple
   end
   it "#success? returns true" do
-    result.must_be :success?
+    expect(result).to be_success
   end
   it "#failure? returns false" do
-    result.wont_be :failure?
+    expect(result).to_not be_failure
   end
   it "#size returns 2" do
-    result.size.must_equal 2
+    expect(result.size).to eq 2
   end
   it "#to_native returns valid Array" do
-    result.to_native.must_equal ["one","two"]
+    expect(result.to_native).to eq ["one","two"]
   end
   it "#to_saper returns valid Array" do
-    result.to_saper.must_equal [Saper::Items::Text.new("one"),Saper::Items::Text.new("two")]
+    expect(result.to_saper).to eq [Saper::Items::Text.new("one"),Saper::Items::Text.new("two")]
   end
   it "#to_json returns valid String" do
-    result.to_json.must_equal '["one","two"]'
+    expect(result.to_json).to eq '["one","two"]'
   end
 end

data/spec/items/atom_spec.rb

@@ -1,12 +1,12 @@
 require './spec/spec_helper'
 
-describe Saper::Items::Atom do
+RSpec.describe Saper::Items::Atom do
   
-  it ".new" # TODO
-  it "#[]" # TODO
-  it "#serialize" # TODO
-  it "#to_hash" # TODO
-  it "#to_native" # TODO
-  it "#to_json" # TODO
+  context ".new" # TODO
+  context "#[]" # TODO
+  context "#serialize" # TODO
+  context "#to_hash" # TODO
+  context "#to_native" # TODO
+  context "#to_json" # TODO
     
 end

data/spec/items/document_spec.rb

@@ -1,6 +1,6 @@
 require './spec/spec_helper'
 
-describe Saper::Items::Document do
+RSpec.describe Saper::Items::Document do
   let(:doc) do
     Saper::Items::Document.new("")
   end
@@ -8,96 +8,96 @@ describe Saper::Items::Document do
     Saper::Items::Document.new("", "http://google.com", { "content-type" => "text/html; charset=win-1251" })
   end
   it ".new(nil) raises InvalidItem" do
-    lambda { Saper::Items::Document.new(nil) }.must_raise(Saper::InvalidItem)
+    expect { Saper::Items::Document.new(nil) }.to raise_error Saper::InvalidItem
   end
   it "#uri returns nil by default" do
-    doc.uri.must_be_nil
+    expect(doc.uri).to be_nil
   end
   it "#uri returns URI when defined" do
-    doc_with_params.uri.must_equal "http://google.com"
+    expect(doc_with_params.uri).to eq "http://google.com"
   end
   it "#mime returns nil by default" do
-    doc.mime.must_be_nil
+    expect(doc.mime).to be_nil
   end
   it "#mime returns mime type if defined in headers" do
-    doc_with_params.mime.must_equal "text/html"
+    expect(doc_with_params.mime).to eq "text/html"
   end
   it "#charset returns nil by defaukt" do
-    doc.charset.must_be_nil
+    expect(doc.charset).to be_nil
   end
   it "#charset returns charset if defined in headers" do
-    doc_with_params.charset.must_equal "win-1251"
+    expect(doc_with_params.charset).to eq "win-1251"
   end
 end
 
-describe "Saper::Items::Document(empty String)" do
+RSpec.describe "Saper::Items::Document(empty String)" do
   subject do
     Saper::Items::Document.new("")
   end
   it "#size returns zero" do
-    subject.size.must_equal 0
+    expect(subject.size).to eq 0
   end
   it "#to_html raises InvalidItem" do
-    lambda { subject.to_html }.must_raise(Saper::InvalidItem)
+    expect { subject.to_html }.to raise_error Saper::InvalidItem
   end
   it "#to_markdown raises InvalidItem" do
-    lambda { subject.to_markdown }.must_raise(Saper::InvalidItem)
+    expect { subject.to_markdown }.to raise_error Saper::InvalidItem
   end
   it "#to_native returns empty string" do
-    subject.to_native.must_equal ""
+    expect(subject.to_native).to eq ""
   end
   it "#to_text returns Text" do
-    subject.to_text.must_be_kind_of(Saper::Items::Text)
+    expect(subject.to_text).to be_a Saper::Items::Text
   end
   it "#to_xml raises InvalidItem" do
-    lambda { subject.to_xml }.must_raise(Saper::InvalidItem)
+    expect { subject.to_xml }.to raise_error Saper::InvalidItem
   end
 end
 
-describe "Saper::Items::Document(HTML as String)" do
+RSpec.describe "Saper::Items::Document(HTML as String)" do
   subject do
     Saper::Items::Document.new("<html></html>")
   end
   it "#size returns string length" do
-    subject.size.must_equal 13
+    expect(subject.size).to eq 13
   end
   it "#to_html returns HTML" do
-    subject.to_html.must_be_kind_of(Saper::Items::HTML)
+    expect(subject.to_html).to be_a Saper::Items::HTML
   end
   it "#to_markdown returns Markdown" do
-    subject.to_markdown.must_be_kind_of(Saper::Items::Markdown)
+    expect(subject.to_markdown).to be_a Saper::Items::Markdown
   end
   it "#to_native returns document contents" do
-    subject.to_native.must_equal "<html></html>"
+    expect(subject.to_native).to eq "<html></html>"
   end
   it "#to_text returns Text" do
-    subject.to_text.must_be_kind_of(Saper::Items::Text)
+    expect(subject.to_text).to be_a Saper::Items::Text
   end
   it "#to_xml raises InvalidItem" do
-    subject.to_xml.must_be_kind_of(Saper::Items::XML)
+    expect(subject.to_xml).to be_a Saper::Items::XML
   end
 end
 
-describe "Saper::Items::Document(XML as String)" do
+RSpec.describe "Saper::Items::Document(XML as String)" do
   subject do
     Saper::Items::Document.new("<response></response>")
   end
   it "#size returns string length" do
-    subject.size.must_equal 21
+    expect(subject.size).to eq 21
   end
   it "#to_html returns HTML" do
-    subject.to_html.must_be_kind_of(Saper::Items::HTML)
+    expect(subject.to_html).to be_a Saper::Items::HTML
   end
   it "#to_markdown returns Markdown" do
-    subject.to_markdown.must_be_kind_of(Saper::Items::Markdown)
+    expect(subject.to_markdown).to be_a Saper::Items::Markdown
   end
   it "#to_native returns document contents" do
-    subject.to_native.must_equal "<response></response>"
+    expect(subject.to_native).to eq "<response></response>"
   end
   it "#to_text returns Text" do
-    subject.to_text.must_be_kind_of(Saper::Items::Text)
+    expect(subject.to_text).to be_a Saper::Items::Text
   end
   it "#to_xml returns XML" do
-    subject.to_xml.must_be_kind_of(Saper::Items::XML)
+    expect(subject.to_xml).to be_a Saper::Items::XML
   end
 end

data/spec/items/html_spec.rb

@@ -1,58 +1,90 @@
 require './spec/spec_helper'
 
-describe Saper::Items::HTML do
+RSpec.describe Saper::Items::HTML do
   let :html do
     "<html><body><p><a href=\"http://google.com\">Google</a></p><p><a href=\"http://yandex.ru\">Yandex</a></p></body></html>"
   end
   let :subject do
     Saper::Items::HTML.new html
   end
-  it "::new(nil) raises InvalidItem" do
-    lambda { Saper::Items::HTML.new(nil) }.must_raise(Saper::InvalidItem)
-  end
-  it "::new('') raises InvalidItem" do
-    lambda { Saper::Items::HTML.new("") }.must_raise(Saper::InvalidItem)
-  end
-  it "::new(String) returns HTML" do
-    Saper::Items::HTML.new("string").must_be_instance_of(Saper::Items::HTML)
-  end
-  it "#find(valid) returns HTML" do
-    subject.find("a").must_be_kind_of(Saper::Items::HTML)
-  end
-  it "#find(invalid) returns nil" do
-    subject.find("li").must_be_nil
-  end
-  it "#find_all(valid) returns an Array of HTML instances" do
-    subject.find_all("a").first.must_be_kind_of(Saper::Items::HTML)
-  end
-  it "#find_all(invalid) returns an empty Array" do
-    subject.find_all("li").must_be_empty
-  end
-  it "#[](valid) returns Text" do
-    subject.find("a")["href"].must_be_kind_of(Saper::Items::Text)
-  end
-  it "#[](invalid) returns nil" do
-    subject.find("a")["unknown"].must_be_nil
-  end
-  it "#inner_html returns Text" do
-    subject.inner_html.must_be_kind_of(Saper::Items::Text)
-  end
-  it "#inner_html returns valid contents" do
-    subject.inner_html.must_be :==, html
-  end
-  it "#inner_text returns Text" do
-    subject.inner_text.must_be_kind_of(Saper::Items::Text)
-  end
-  it "#remove_children_preserving_content returns modified HTML" do
-    subject.remove_children_preserving_content("a").to_native.must_equal "<html><body><p>Google</p><p>Yandex</p></body></html>"
-  end
-  it "#remove_children_with_content returns modified HTML" do
-    subject.remove_children_with_content("a").to_native.must_equal "<html><body><p></p><p></p></body></html>"
-  end
-  it "#to_markdown returns Markdown" do
-    subject.to_markdown.must_be_kind_of(Saper::Items::Markdown)
-  end
-  it "#== returns true for matching string" do
-    subject.to_s.must_be :==, html
+  context ".new(nil)" do
+    it "raises InvalidItem" do
+      expect { Saper::Items::HTML.new(nil) }.to raise_error Saper::InvalidItem
+    end
+  end
+  context ".new('')" do
+    it "raises InvalidItem" do
+      expect { Saper::Items::HTML.new("") }.to raise_error Saper::InvalidItem
+    end
+  end
+  context ".new(String)" do
+    it "returns HTML" do
+      expect(Saper::Items::HTML.new("string")).to be_a Saper::Items::HTML
+    end
+  end
+  context "#find(valid)" do
+    it "returns HTML" do
+      expect(subject.find("a")).to be_a Saper::Items::HTML
+    end
+  end
+  context "#find(invalid)" do
+    it "returns nil" do
+      expect(subject.find("li")).to be_nil
+    end
+  end
+  context "#find_all(valid)" do
+    it "returns an Array of HTML instances" do
+      expect(subject.find_all("a").first).to be_a Saper::Items::HTML
+    end
+  end
+  context "#find_all(invalid)" do
+    it "returns an empty Array" do
+      expect(subject.find_all("li")).to be_empty
+    end
+  end
+  context "#[](valid)" do
+    it "returns Text" do
+      expect(subject.find("a")["href"]).to be_a Saper::Items::Text
+    end
+  end
+  context "#[](invalid)" do
+    it "returns nil" do
+      expect(subject.find("a")["unknown"]).to be_nil
+    end
+  end
+  context "#inner_html" do
+    it "returns Text" do
+      expect(subject.inner_html).to be_a Saper::Items::Text
+    end
+  end
+  context "#inner_html" do
+    it "returns valid contents" do
+      expect(subject.inner_html).to eq html
+    end
+  end
+  context "#inner_text" do
+    it "returns Text" do
+      expect(subject.inner_text).to be_a Saper::Items::Text
+    end
+  end
+  context "#remove_children_preserving_content" do
+    it "returns modified HTML" do
+      expect(subject.remove_children_preserving_content("a").to_native).to eq "<html><body><p>Google</p><p>Yandex</p></body></html>"
+    end
+  end
+  context "#remove_children_with_content" do
+    it "returns modified HTML" do
+      expect(subject.remove_children_with_content("a").to_native).to eq "<html><body><p></p><p></p></body></html>"
+    end
+  end
+  context "#to_markdown" do
+    it "returns Markdown" do
+      expect(subject.to_markdown).to be_a Saper::Items::Markdown
+    end
+  end
+  context "#==" do
+    it "returns true for matching string" do
+      expect(subject.to_s).to eq html
+    end
   end
 end