manticore 0.4.2-java → 0.4.3-java

data/spec/manticore/cookie_spec.rb

@@ -5,14 +5,14 @@ describe Manticore::Cookie do
     let(:client) { Manticore::Client.new cookies: true }
     subject {
       response = client.get(local_server("/cookies/1/2"))
-      response.final_url.to_s.should == local_server("/cookies/2/2")
+      expect(response.final_url.to_s).to eq local_server("/cookies/2/2")
       response.cookies["x"].first
     }
 
-    its(:name)   { should == "x" }
-    its(:value)  { should == "2" }
-    its(:path)   { should == "/" }
-    its(:domain) { should == "localhost" }
+    its(:name)   { is_expected.to eq "x" }
+    its(:value)  { is_expected.to eq "2" }
+    its(:path)   { is_expected.to eq "/" }
+    its(:domain) { is_expected.to eq "localhost" }
   end
 
 
@@ -21,16 +21,16 @@ describe Manticore::Cookie do
     Manticore::Cookie.new({name: "foo", value: "bar"}.merge(opts))
   }
 
-  its(:secure?)     { should be nil }
-  its(:persistent?) { should be nil }
+  its(:secure?)     { is_expected.to be nil }
+  its(:persistent?) { is_expected.to be nil }
 
   context "created as secure" do
     let(:opts) {{ secure: true }}
-    its(:secure?) { should be true }
+    its(:secure?) { is_expected.to be true }
   end
 
   context "created as persistent" do
     let(:opts) {{ persistent: true }}
-    its(:persistent?) { should be true }
+    its(:persistent?) { is_expected.to be true }
   end
 end

data/spec/manticore/facade_spec.rb

@@ -16,26 +16,26 @@ describe Manticore::Facade do
       end
     }
 
-    it "should get a response" do
+    it "gets a response" do
       result = JSON.parse extended_class.get(local_server).body
-      result["method"].should == "GET"
+      expect(result["method"]).to eq "GET"
     end
 
-    it "should not use the shared client by default" do
-      extended_class.instance_variable_get("@manticore_facade").object_id.should_not ==
+    it "does not use the shared client by default" do
+      expect(extended_class.instance_variable_get("@manticore_facade").object_id).to_not eq \
         Manticore.instance_variable_get("@manticore_facade").object_id
     end
 
-    it "should be able to use the shared client" do
-      extended_shared_class.instance_variable_get("@manticore_facade").object_id.should ==
+    it "is able to use the shared client" do
+      expect(extended_shared_class.instance_variable_get("@manticore_facade").object_id).to eq \
         Manticore.instance_variable_get("@manticore_facade").object_id
     end
   end
 
   context "from the default Manticore module" do
-    it "should get a response" do
+    it "gets a response" do
       result = JSON.parse Manticore.get(local_server).body
-      result["method"].should == "GET"
+      expect(result["method"]).to eq "GET"
     end
   end
 end

data/spec/manticore/response_spec.rb

@@ -4,36 +4,36 @@ describe Manticore::Response do
   let(:client) { Manticore::Client.new }
   subject { client.get( local_server ) }
 
-  its(:headers) { should be_a Hash }
-  its(:body)    { should be_a String }
-  its(:length)  { should be_a Fixnum }
+  its(:headers) { is_expected.to be_a Hash }
+  its(:body)    { is_expected.to be_a String }
+  its(:length)  { is_expected.to be_a Fixnum }
 
-  it "should provide response header lookup via #[]" do
-    subject["Content-Type"].should eq "text/plain"
+  it "provides response header lookup via #[]" do
+    expect(subject["Content-Type"]).to eq "text/plain"
   end
 
-  it "should read the body" do
-    subject.body.should match "Manticore"
+  it "reads the body" do
+    expect(subject.body).to match "Manticore"
   end
 
-  it "should read the status code" do
-    subject.code.should eq 200
+  it "reads the status code" do
+    expect(subject.code).to eq 200
   end
 
-  it "should read the status text" do
-    subject.message.should match "OK"
+  it "reads the status text" do
+    expect(subject.message).to match "OK"
   end
 
   context "when the client is invoked with a block" do
-    it "should allow reading the body from a block" do
+    it "allows reading the body from a block" do
       response = client.get(local_server) do |response|
-        response.body.should match 'Manticore'
+        expect(response.body).to match 'Manticore'
       end
 
-      response.body.should match "Manticore"
+      expect(response.body).to match "Manticore"
     end
 
-    it "should not read the body implicitly if called with a block" do
+    it "does not read the body implicitly if called with a block" do
       response = client.get(local_server) {}
       expect { response.body }.to raise_exception(Manticore::StreamClosedException)
     end
@@ -42,7 +42,7 @@ describe Manticore::Response do
   context "when an entity fails to read" do
     it "releases the connection" do
       stats_before = client.pool_stats
-      Manticore::EntityConverter.any_instance.should_receive(:read_entity).and_raise(Manticore::StreamClosedException)
+      expect_any_instance_of(Manticore::EntityConverter).to receive(:read_entity).and_raise(Manticore::StreamClosedException)
       expect { client.get(local_server).call rescue nil }.to_not change { client.pool_stats[:available] }
     end
   end

data/spec/manticore/stubbed_response_spec.rb

@@ -13,32 +13,37 @@ describe Manticore::StubbedResponse do
     ).call
   }
 
-  it { should be_a Manticore::Response }
-  its(:body) { should == "test body" }
-  its(:code) { should == 200 }
+  it { is_expected.to be_a Manticore::Response }
+  its(:body) { is_expected.to eq "test body" }
+  its(:code) { is_expected.to eq 200 }
 
-  it "should persist the set headers" do
-    subject.headers["content-type"].should == "text/plain"
+  it "persists the set headers" do
+    expect(subject.headers["content-type"]).to eq "text/plain"
   end
 
-  it "should set content-length from the body" do
-    subject.headers["content-length"].should == 9
+  it "sets content-length from the body" do
+    expect(subject.headers["content-length"]).to eq "9"
   end
 
-  it "should persist cookies passed as explicit cookie objects" do
-    subject.cookies["test"].first.value.should == "something"
+  it "persists cookies passed as explicit cookie objects" do
+    expect(subject.cookies["test"].first.value).to eq "something"
   end
 
-  it "should call on_success handlers" do
+  it "calls on_success handlers" do
     called = false
     Manticore::StubbedResponse.stub.on_success {|resp| called = true }.call
-    called.should be true
+    expect(called).to be true
   end
 
   it "should persist cookies passed in set-cookie" do
-    subject.cookies["k"].map(&:value).should  =~ ["v", "v"]
-    subject.cookies["k"].map(&:path).should   =~ ["/", "/sub"]
-    subject.cookies["k"].map(&:domain).should =~ ["localhost", "sub.localhost"]
-    subject.cookies["k2"].first.value.should == "v2"
+    expect(subject.cookies["k"].map(&:value)).to match_array ["v", "v"]
+    expect(subject.cookies["k"].map(&:path)).to match_array ["/", "/sub"]
+    expect(subject.cookies["k"].map(&:domain)).to match_array ["localhost", "sub.localhost"]
+    expect(subject.cookies["k2"].first.value).to eq "v2"
+  end
+
+  it "passes bodies to blocks for streaming reads" do
+    total = ""; subject.body {|chunk| total << chunk }
+    expect(total).to eq("test body")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: java
 authors:
 - Chris Heald
@@ -30,12 +30,12 @@ cert_chain:
   cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
   /3Mhp5UWSl9SmDR1
   -----END CERTIFICATE-----
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   name: addressable
@@ -43,13 +43,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: bundler
@@ -57,13 +57,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
@@ -71,7 +71,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Manticore is an HTTP client built on the Apache HttpCore components
@@ -81,8 +81,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - APACHE-LICENSE-2.0.txt
 - CHANGELOG.md
 - Gemfile
@@ -127,12 +127,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []