webmachine 1.2.2 → 1.3.0

data/spec/webmachine/resource/authentication_spec.rb

@@ -31,14 +31,14 @@ describe Webmachine::Resource::Authentication do
     context "when no authorization is sent by the client" do
       it "should reply with a 401 Unauthorized and a WWW-Authenticate header using Basic" do
         subject.run
-        response.code.should == 401
-        response.headers['WWW-Authenticate'].should == 'Basic realm="Webmachine"'
+        expect(response.code).to eq(401)
+        expect(response.headers['WWW-Authenticate']).to eq('Basic realm="Webmachine"')
       end
 
       it "should use the specified realm in the WWW-Authenticate header" do
         resource.realm = "My App"
         subject.run
-        response.headers['WWW-Authenticate'].should == 'Basic realm="My App"'
+        expect(response.headers['WWW-Authenticate']).to eq('Basic realm="My App"')
       end
     end
 
@@ -49,8 +49,8 @@ describe Webmachine::Resource::Authentication do
 
       it "should reply with a 401 Unauthorized and a WWW-Authenticate header using Basic" do
         subject.run
-        response.code.should == 401
-        response.headers['WWW-Authenticate'].should == 'Basic realm="Webmachine"'
+        expect(response.code).to eq(401)
+        expect(response.headers['WWW-Authenticate']).to eq('Basic realm="Webmachine"')
       end
     end
 
@@ -61,7 +61,7 @@ describe Webmachine::Resource::Authentication do
 
       it "should not reply with 401 Unauthorized" do
         subject.run
-        response.code.should_not == 401
+        expect(response.code).not_to eq(401)
       end
     end
   end

data/spec/webmachine/response_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 describe Webmachine::Response do
 
   it "should have sane default values" do
-    subject.code.should == 200
-    subject.is_redirect?.should be_false
-    subject.headers.should be_empty
+    expect(subject.code).to eq(200)
+    expect(subject.is_redirect?).to be(false)
+    expect(subject.headers).to be_empty
   end
 
   describe "a redirected response" do
     let(:redirect_url) { "/" }
 
-    before(:all) { subject.redirect_to redirect_url }
+    before(:each) { subject.redirect_to redirect_url }
 
-    its(:is_redirect?) { should be_true }
+    its(:is_redirect?) { should be(true) }
 
     it "should have a proper Location header" do
-      subject.headers["Location"].should == redirect_url
+      expect(subject.headers["Location"]).to eq(redirect_url)
     end
   end
 
@@ -24,21 +24,21 @@ describe Webmachine::Response do
     let(:cookie) { "monster" }
     let(:cookie_value) { "mash" }
 
-    before(:all) { subject.set_cookie(cookie, cookie_value) }
+    before(:each) { subject.set_cookie(cookie, cookie_value) }
 
     it "should have a proper Set-Cookie header" do
-      subject.headers["Set-Cookie"].should include "monster=mash";
+      expect(subject.headers["Set-Cookie"]).to include "monster=mash"
     end
 
     describe "setting multiple cookies" do
       let(:cookie2) { "rodeo" }
       let(:cookie2_value) { "clown" }
-      before(:all) { subject.set_cookie(cookie2, cookie2_value) }
+      before(:each) { subject.set_cookie(cookie2, cookie2_value) }
 
       it "should have a proper Set-Cookie header" do
-        subject.headers["Set-Cookie"].should be_a Array
-        subject.headers["Set-Cookie"].should include "rodeo=clown"
-        subject.headers["Set-Cookie"].should include "monster=mash"
+        expect(subject.headers["Set-Cookie"]).to be_a Array
+        expect(subject.headers["Set-Cookie"]).to include "rodeo=clown"
+        expect(subject.headers["Set-Cookie"]).to include "monster=mash"
       end
     end
   end

data/spec/webmachine/trace/fsm_spec.rb

@@ -7,31 +7,31 @@ describe Webmachine::Trace::FSM do
   before { Webmachine::Trace.trace_store = :memory }
 
   context "when tracing is enabled" do
-    before { Webmachine::Trace.stub!(:trace?).and_return(true) }
+    before { allow(Webmachine::Trace).to receive(:trace?).and_return(true) }
 
     it "proxies the resource" do
-      subject.resource.should be_kind_of(Webmachine::Trace::ResourceProxy)
+      expect(subject.resource).to be_kind_of(Webmachine::Trace::ResourceProxy)
     end
 
     it "records a trace" do
       subject.run
-      response.trace.should_not be_empty
-      Webmachine::Trace.traces.should have(1).item
+      expect(response.trace).to_not be_empty
+      expect(Webmachine::Trace.traces.size).to eq(1)
     end
 
     it "commits the trace to separate storage when the request has finished processing" do
-      Webmachine::Trace.should_receive(:record).with(subject.resource.object_id.to_s, response.trace).and_return(true)
+      expect(Webmachine::Trace).to receive(:record).with(subject.resource.object_id.to_s, response.trace).and_return(true)
       subject.run
     end
   end
 
   context "when tracing is disabled" do
-    before { Webmachine::Trace.stub!(:trace?).and_return(false) }
+    before { allow(Webmachine::Trace).to receive(:trace?).and_return(false) }
 
     it "leaves no trace" do
       subject.run
-      response.trace.should be_empty
-      Webmachine::Trace.traces.should be_empty
+      expect(response.trace).to be_empty
+      expect(Webmachine::Trace.traces).to be_empty
     end
   end
 end

data/spec/webmachine/trace/resource_proxy_spec.rb

@@ -7,28 +7,28 @@ describe Webmachine::Trace::ResourceProxy do
 
   it "duck-types all callback methods" do
     Webmachine::Resource::Callbacks.instance_methods(false).each do |m|
-      subject.should respond_to(m)
+      expect(subject).to respond_to(m)
     end
   end
 
   it "logs invocations of callbacks" do
     subject.generate_etag
-    response.trace.should == [{:type => :attempt, :name => "(default)#generate_etag"},
-                              {:type => :result, :value => nil}]
+    expect(response.trace).to eq([{:type => :attempt, :name => "(default)#generate_etag"},
+                              {:type => :result, :value => nil}])
 
   end
 
   it "logs invocations of body-producing methods" do
-    subject.content_types_provided.should == [["text/html", :to_html]]
+    expect(subject.content_types_provided).to eq([["text/html", :to_html]])
     subject.to_html
-    response.trace[-2][:type].should == :attempt
-    response.trace[-2][:name].should =~ /to_html$/
-    response.trace[-2][:source].should include("spec_helper.rb") if response.trace[-2][:source]
-    response.trace[-1].should == {:type => :result, :value => "<html><body>Hello, world!</body></html>"}
+    expect(response.trace[-2][:type]).to eq(:attempt)
+    expect(response.trace[-2][:name]).to match(/to_html$/)
+    expect(response.trace[-2][:source]).to include("spec_helper.rb") if response.trace[-2][:source]
+    expect(response.trace[-1]).to eq({:type => :result, :value => "<html><body>Hello, world!</body></html>"})
   end
 
   it "sets the trace id header when the request has finished processing" do
     subject.finish_request
-    response.headers["X-Webmachine-Trace-Id"].should == subject.object_id.to_s
+    expect(response.headers["X-Webmachine-Trace-Id"]).to eq(subject.object_id.to_s)
   end
 end

data/spec/webmachine/trace/trace_store_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 require 'fileutils'
 
 shared_examples_for "trace storage" do
-  it { should respond_to(:[]=) }
-  it { should respond_to(:keys) }
-  it { should respond_to(:fetch) }
+  it { is_expected.to respond_to(:[]=) }
+  it { is_expected.to respond_to(:keys) }
+  it { is_expected.to respond_to(:fetch) }
 
   it "stores a trace" do
     subject["foo"] = [:bar]
-    subject.fetch("foo").should == [:bar]
+    expect(subject.fetch("foo")).to eq([:bar])
   end
 
   it "lists a stored trace in the keys" do
     subject["foo"] = [:bar]
-    subject.keys.should == ["foo"]
+    expect(subject.keys).to eq(["foo"])
   end
 end
 

data/spec/webmachine/trace_spec.rb

@@ -6,12 +6,12 @@ describe Webmachine::Trace do
   context "determining whether the resource should be traced" do
     include_context "default resource"
     it "does not trace by default" do
-      subject.trace?(resource).should be_false
+      expect(subject.trace?(resource)).to be(false)
     end
 
     it "traces when the resource enables tracing" do
-      resource.should_receive(:trace?).and_return(true)
-      subject.trace?(resource).should be_true
+      expect(resource).to receive(:trace?).and_return(true)
+      expect(subject.trace?(resource)).to be(true)
     end
   end
 end

data/webmachine.gemspec

@@ -1,4 +1,4 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
 require 'webmachine/version'
 
 Gem::Specification.new do |gem|
@@ -13,15 +13,11 @@ Gem::Specification.new do |gem|
   gem.homepage = "http://github.com/seancribbs/webmachine-ruby"
   gem.authors = ["Sean Cribbs"]
   gem.email = ["sean@basho.com"]
-  gem.license = "Apache 2.0"
+  gem.license = "Apache-2.0"
 
   gem.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
   gem.add_runtime_dependency(%q<multi_json>)
   gem.add_runtime_dependency(%q<as-notifications>, ["~> 1.0"])
-  gem.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
-  gem.add_development_dependency(%q<yard>, ["~> 0.7.3"])
-  gem.add_development_dependency(%q<rake>)
-  gem.add_development_dependency(%q<rack>)
 
   ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten
   gem.files = (Dir['**/*','.gitignore'] - ignores).reject {|f| !File.file?(f) }

metadata

@@ -1,286 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: webmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Sean Cribbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: as-notifications
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rack
-  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: ! ' webmachine is a toolkit for building HTTP applications in a declarative
+description: " webmachine is a toolkit for building HTTP applications in a declarative
   fashion, that avoids the confusion of going through a CGI-style interface like Rack.
   It is strongly influenced by the original Erlang project of the same name and shares
-  its opinionated nature about HTTP. '
+  its opinionated nature about HTTP. "
 email:
 - sean@basho.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/autospec
-- bin/coderay
-- bin/gpgen
-- bin/guard
-- bin/hatetepe
-- bin/htmldiff
-- bin/ldiff
-- bin/mongrel_rails
-- bin/pry
-- bin/rackup
-- bin/rake
-- bin/redcarpet
-- bin/reel
-- bin/rspec
-- bin/thor
-- bin/yard
-- bin/yardoc
-- bin/yri
+- ".gitignore"
 - CHANGELOG.md
-- doc/_index.html
-- doc/class_list.html
-- doc/css/common.css
-- doc/css/full_list.css
-- doc/css/style.css
-- doc/file.README.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/js/app.js
-- doc/js/full_list.js
-- doc/js/jquery.js
-- doc/method_list.html
-- doc/top-level-namespace.html
-- doc/Webmachine/Adapter.html
-- doc/Webmachine/Adapters/Hatetepe/Body.html
-- doc/Webmachine/Adapters/Hatetepe.html
-- doc/Webmachine/Adapters/LazyRequestBody.html
-- doc/Webmachine/Adapters/Mongrel/Handler.html
-- doc/Webmachine/Adapters/Mongrel/RequestBody.html
-- doc/Webmachine/Adapters/Mongrel.html
-- doc/Webmachine/Adapters/Rack/RequestBody.html
-- doc/Webmachine/Adapters/Rack.html
-- doc/Webmachine/Adapters/Reel.html
-- doc/Webmachine/Adapters/WEBrick/RequestBody.html
-- doc/Webmachine/Adapters/WEBrick/Server.html
-- doc/Webmachine/Adapters/WEBrick.html
-- doc/Webmachine/Adapters.html
-- doc/Webmachine/Application.html
-- doc/Webmachine/CallableEncoder.html
-- doc/Webmachine/ChunkedBody.html
-- doc/Webmachine/Configuration.html
-- doc/Webmachine/Cookie.html
-- doc/Webmachine/Decision/Conneg/MediaTypeList.html
-- doc/Webmachine/Decision/Conneg/PriorityList.html
-- doc/Webmachine/Decision/Conneg.html
-- doc/Webmachine/Decision/Flow.html
-- doc/Webmachine/Decision/FSM.html
-- doc/Webmachine/Decision/Helpers.html
-- doc/Webmachine/Decision.html
-- doc/Webmachine/Dispatcher/Route.html
-- doc/Webmachine/Dispatcher.html
-- doc/Webmachine/EnumerableEncoder.html
-- doc/Webmachine/Error.html
-- doc/Webmachine/ETag.html
-- doc/Webmachine/FiberEncoder.html
-- doc/Webmachine/Headers.html
-- doc/Webmachine/InvalidResource.html
-- doc/Webmachine/MalformedRequest.html
-- doc/Webmachine/MediaType.html
-- doc/Webmachine/QuotedString.html
-- doc/Webmachine/Request.html
-- doc/Webmachine/Resource/Authentication.html
-- doc/Webmachine/Resource/Callbacks.html
-- doc/Webmachine/Resource/Encodings.html
-- doc/Webmachine/Resource/EntityTags.html
-- doc/Webmachine/Resource/Tracing.html
-- doc/Webmachine/Resource.html
-- doc/Webmachine/Response/HeaderHash.html
-- doc/Webmachine/Response.html
-- doc/Webmachine/Streaming/CallableEncoder.html
-- doc/Webmachine/Streaming/Encoder.html
-- doc/Webmachine/Streaming/EnumerableEncoder.html
-- doc/Webmachine/Streaming/FiberEncoder.html
-- doc/Webmachine/Streaming/IOEncoder.html
-- doc/Webmachine/Streaming.html
-- doc/Webmachine/StreamingEncoder.html
-- doc/Webmachine/Trace/Call.html
-- doc/Webmachine/Trace/FSM.html
-- doc/Webmachine/Trace/PStoreTraceStore.html
-- doc/Webmachine/Trace/ResourceProxy.html
-- doc/Webmachine/Trace/TraceResource.html
-- doc/Webmachine/Trace/Wrapper.html
-- doc/Webmachine/Trace.html
-- doc/Webmachine/Translation.html
-- doc/Webmachine/WeakETag.html
-- doc/Webmachine.html
+- Gemfile
+- Guardfile
+- LICENSE
+- README.md
+- Rakefile
+- documentation/adapters.md
+- documentation/authentication-and-authorization.md
+- documentation/configurator.md
+- documentation/error-handling.md
+- documentation/examples.md
+- documentation/how-it-works.md
+- documentation/routes.md
+- documentation/validation.md
+- documentation/versioning-apis.md
+- documentation/visual-debugger.md
 - examples/application.rb
 - examples/debugger.rb
 - examples/logging.rb
 - examples/webrick.rb
-- Gemfile
-- Guardfile
+- lib/webmachine.rb
 - lib/webmachine/adapter.rb
-- lib/webmachine/adapters/hatetepe.rb
+- lib/webmachine/adapters.rb
+- lib/webmachine/adapters/httpkit.rb
 - lib/webmachine/adapters/lazy_request_body.rb
-- lib/webmachine/adapters/mongrel.rb
 - lib/webmachine/adapters/rack.rb
 - lib/webmachine/adapters/reel.rb
 - lib/webmachine/adapters/webrick.rb
-- lib/webmachine/adapters.rb
 - lib/webmachine/application.rb
 - lib/webmachine/chunked_body.rb
 - lib/webmachine/configuration.rb
+- lib/webmachine/constants.rb
 - lib/webmachine/cookie.rb
+- lib/webmachine/decision.rb
 - lib/webmachine/decision/conneg.rb
 - lib/webmachine/decision/falsey.rb
 - lib/webmachine/decision/flow.rb
 - lib/webmachine/decision/fsm.rb
 - lib/webmachine/decision/helpers.rb
-- lib/webmachine/decision.rb
-- lib/webmachine/dispatcher/not_found_resource.rb
-- lib/webmachine/dispatcher/route.rb
 - lib/webmachine/dispatcher.rb
+- lib/webmachine/dispatcher/route.rb
 - lib/webmachine/errors.rb
 - lib/webmachine/etags.rb
-- lib/webmachine/events/instrumented_event.rb
 - lib/webmachine/events.rb
-- lib/webmachine/fiber18.rb
+- lib/webmachine/events/instrumented_event.rb
+- lib/webmachine/header_negotiation.rb
 - lib/webmachine/headers.rb
 - lib/webmachine/locale/en.yml
 - lib/webmachine/media_type.rb
 - lib/webmachine/quoted_string.rb
 - lib/webmachine/request.rb
+- lib/webmachine/resource.rb
 - lib/webmachine/resource/authentication.rb
 - lib/webmachine/resource/callbacks.rb
 - lib/webmachine/resource/encodings.rb
 - lib/webmachine/resource/entity_tags.rb
 - lib/webmachine/resource/tracing.rb
-- lib/webmachine/resource.rb
 - lib/webmachine/response.rb
+- lib/webmachine/spec/IO_response.body
 - lib/webmachine/spec/adapter_lint.rb
 - lib/webmachine/spec/test_resource.rb
+- lib/webmachine/streaming.rb
 - lib/webmachine/streaming/callable_encoder.rb
 - lib/webmachine/streaming/encoder.rb
 - lib/webmachine/streaming/enumerable_encoder.rb
 - lib/webmachine/streaming/fiber_encoder.rb
 - lib/webmachine/streaming/io_encoder.rb
-- lib/webmachine/streaming.rb
+- lib/webmachine/trace.rb
 - lib/webmachine/trace/fsm.rb
 - lib/webmachine/trace/listener.rb
 - lib/webmachine/trace/pstore_trace_store.rb
@@ -291,17 +141,12 @@ files:
 - lib/webmachine/trace/static/wmtrace.css
 - lib/webmachine/trace/static/wmtrace.js
 - lib/webmachine/trace/trace_resource.rb
-- lib/webmachine/trace.rb
 - lib/webmachine/translation.rb
 - lib/webmachine/version.rb
-- lib/webmachine.rb
-- LICENSE
-- Rakefile
-- README.md
+- memory_test.rb
 - spec/spec_helper.rb
 - spec/webmachine/adapter_spec.rb
-- spec/webmachine/adapters/hatetepe_spec.rb
-- spec/webmachine/adapters/mongrel_spec.rb
+- spec/webmachine/adapters/httpkit_spec.rb
 - spec/webmachine/adapters/rack_spec.rb
 - spec/webmachine/adapters/reel_spec.rb
 - spec/webmachine/adapters/webrick_spec.rb
@@ -329,37 +174,34 @@ files:
 - spec/webmachine/trace/trace_store_spec.rb
 - spec/webmachine/trace_spec.rb
 - webmachine.gemspec
-- .gitignore
 homepage: http://github.com/seancribbs/webmachine-ruby
 licenses:
-- Apache 2.0
+- Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: webmachine is a toolkit for building HTTP applications,
 test_files:
 - spec/spec_helper.rb
 - spec/webmachine/adapter_spec.rb
-- spec/webmachine/adapters/hatetepe_spec.rb
-- spec/webmachine/adapters/mongrel_spec.rb
+- spec/webmachine/adapters/httpkit_spec.rb
 - spec/webmachine/adapters/rack_spec.rb
 - spec/webmachine/adapters/reel_spec.rb
 - spec/webmachine/adapters/webrick_spec.rb
@@ -386,4 +228,4 @@ test_files:
 - spec/webmachine/trace/resource_proxy_spec.rb
 - spec/webmachine/trace/trace_store_spec.rb
 - spec/webmachine/trace_spec.rb
-- .gitignore
+- ".gitignore"