webmachine 0.1.0 → 0.2.0

data/spec/webmachine/errors_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Webmachine errors" do
+  describe ".render_error" do
+    it "sets the given response code on the response object" do
+      req = double('request', :method => 'GET').as_null_object
+      res = Webmachine::Response.new
+
+      Webmachine.render_error(404, req, res)
+      res.code.should be(404)
+    end
+  end
+end

data/spec/webmachine/headers_spec.rb

@@ -4,8 +4,9 @@ describe Webmachine::Headers do
   it "should set and access values insensitive to case" do
     subject['Content-TYPE'] = "text/plain"
     subject['CONTENT-TYPE'].should == 'text/plain'
+    subject.delete('CoNtEnT-tYpE').should == 'text/plain'
   end
-
+  
   context "filtering with #grep" do
     subject { described_class["content-type" => "text/plain", "etag" => '"abcdef1234567890"'] }
     it "should filter keys by the given pattern" do

data/spec/webmachine/media_type_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe Webmachine::MediaType do
+  let(:raw_type){ "application/xml;charset=UTF-8" }
+  subject { described_class.new("application/xml", {"charset" => "UTF-8"}) }
+
+  context "equivalence" do
+    it { should == raw_type }
+    it { should == described_class.parse(raw_type) }
+  end
+
+  context "when it is the wildcard type" do
+    subject { described_class.new("*/*") }
+    it { should be_matches_all }
+  end
+
+  context "parsing a type" do
+    it "should return MediaTypes untouched" do
+      described_class.parse(subject).should equal(subject)
+    end
+
+    it "should parse a String" do
+      type = described_class.parse(raw_type)
+      type.should be_kind_of(described_class)
+      type.type.should == "application/xml"
+      type.params.should == {"charset" => "UTF-8"}
+    end
+
+    it "should parse a type/params pair" do
+      type = described_class.parse(["application/xml", {"charset" => "UTF-8"}])
+      type.should be_kind_of(described_class)
+      type.type.should == "application/xml"
+      type.params.should ==  {"charset" => "UTF-8"}
+    end
+
+    it "should parse a type/params pair where the type has some params in the string" do
+      type = described_class.parse(["application/xml;version=1",  {"charset" => "UTF-8"}])
+      type.should be_kind_of(described_class)
+      type.type.should == "application/xml"
+      type.params.should ==  {"charset" => "UTF-8", "version" => "1"}
+    end
+
+    it "should parse a type/params pair with params and whitespace in the string" do
+      type = described_class.parse(["multipart/form-data; boundary=----------------------------2c46a7bec2b9", {"charset" => "UTF-8"}])
+      type.should be_kind_of(described_class)
+      type.type.should == "multipart/form-data"
+      type.params.should ==  {"boundary" => "----------------------------2c46a7bec2b9", "charset" => "UTF-8"}
+    end
+
+    it "should raise an error when given an invalid type/params pair" do
+      expect {
+        described_class.parse([false, "blah"])
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe "matching a requested type" do
+    it { should     be_exact_match("application/xml;charset=UTF-8") }
+    it { should     be_exact_match("application/*;charset=UTF-8") }
+    it { should     be_exact_match("*/*;charset=UTF-8") }
+    it { should     be_exact_match("*;charset=UTF-8") }
+    it { should_not be_exact_match("text/xml") }
+    it { should_not be_exact_match("application/xml") }
+    it { should_not be_exact_match("application/xml;version=1") }
+    
+    it { should     be_type_matches("application/xml") }
+    it { should     be_type_matches("application/*") }
+    it { should     be_type_matches("*/*") }
+    it { should     be_type_matches("*") }
+    it { should_not be_type_matches("text/xml") }
+    it { should_not be_type_matches("text/*") }
+
+    it { should     be_params_match({}) }
+    it { should     be_params_match({"charset" => "UTF-8"}) }
+    it { should_not be_params_match({"charset" => "Windows-1252"}) }
+    it { should_not be_params_match({"version" => "3"}) }
+  end
+end

data/webmachine.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
     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.
   DESC
-  gem.homepage = "http://seancribbs.github.com/webmachine.rb"
+  gem.homepage = "http://github.com/seancribbs/webmachine-ruby"
   gem.authors = ["Sean Cribbs"]
   gem.email = ["sean@basho.com"]
 
@@ -23,17 +23,20 @@ Gem::Specification.new do |gem|
       gem.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       gem.add_development_dependency(%q<yard>, ["~> 0.6.7"])
       gem.add_development_dependency(%q<rake>)
+      gem.add_development_dependency(%q<mongrel>, ['~>1.2.beta'])
     else
       gem.add_dependency(%q<i18n>, [">= 0.4.0"])
       gem.add_dependency(%q<rspec>, ["~> 2.6.0"])
       gem.add_dependency(%q<yard>, ["~> 0.6.7"])
       gem.add_dependency(%q<rake>)
+      gem.add_dependency(%q<mongrel>, ['~>1.2.beta'])
     end
   else
     gem.add_dependency(%q<i18n>, [">= 0.4.0"])
     gem.add_dependency(%q<rspec>, ["~> 2.6.0"])
     gem.add_dependency(%q<yard>, ["~> 0.6.7"])
     gem.add_dependency(%q<rake>)
+    gem.add_dependency(%q<mongrel>, ['~>1.2.beta'])
   end
 
   ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmachine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152637280 !ruby/object:Gem::Requirement
+  requirement: &2160756300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152637280
+  version_requirements: *2160756300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152636780 !ruby/object:Gem::Requirement
+  requirement: &2160755360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152636780
+  version_requirements: *2160755360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152636300 !ruby/object:Gem::Requirement
+  requirement: &2160754640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2152636300
+  version_requirements: *2160754640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152635920 !ruby/object:Gem::Requirement
+  requirement: &2160754100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152635920
+  version_requirements: *2160754100
+- !ruby/object:Gem::Dependency
+  name: mongrel
+  requirement: &2160752320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.beta
+  type: :development
+  prerelease: false
+  version_requirements: *2160752320
 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
@@ -68,8 +79,10 @@ files:
 - examples/webrick.rb
 - Gemfile
 - Guardfile
+- lib/webmachine/adapters/mongrel.rb
 - lib/webmachine/adapters/webrick.rb
 - lib/webmachine/adapters.rb
+- lib/webmachine/configuration.rb
 - lib/webmachine/decision/conneg.rb
 - lib/webmachine/decision/flow.rb
 - lib/webmachine/decision/fsm.rb
@@ -80,6 +93,7 @@ files:
 - lib/webmachine/errors.rb
 - lib/webmachine/headers.rb
 - lib/webmachine/locale/en.yml
+- lib/webmachine/media_type.rb
 - lib/webmachine/request.rb
 - lib/webmachine/resource/callbacks.rb
 - lib/webmachine/resource/encodings.rb
@@ -89,19 +103,59 @@ files:
 - lib/webmachine/translation.rb
 - lib/webmachine/version.rb
 - lib/webmachine.rb
+- pkg/webmachine-0.1.0/examples/webrick.rb
+- pkg/webmachine-0.1.0/Gemfile
+- pkg/webmachine-0.1.0/Guardfile
+- pkg/webmachine-0.1.0/lib/webmachine/adapters/webrick.rb
+- pkg/webmachine-0.1.0/lib/webmachine/adapters.rb
+- pkg/webmachine-0.1.0/lib/webmachine/decision/conneg.rb
+- pkg/webmachine-0.1.0/lib/webmachine/decision/flow.rb
+- pkg/webmachine-0.1.0/lib/webmachine/decision/fsm.rb
+- pkg/webmachine-0.1.0/lib/webmachine/decision/helpers.rb
+- pkg/webmachine-0.1.0/lib/webmachine/decision.rb
+- pkg/webmachine-0.1.0/lib/webmachine/dispatcher/route.rb
+- pkg/webmachine-0.1.0/lib/webmachine/dispatcher.rb
+- pkg/webmachine-0.1.0/lib/webmachine/errors.rb
+- pkg/webmachine-0.1.0/lib/webmachine/headers.rb
+- pkg/webmachine-0.1.0/lib/webmachine/locale/en.yml
+- pkg/webmachine-0.1.0/lib/webmachine/request.rb
+- pkg/webmachine-0.1.0/lib/webmachine/resource/callbacks.rb
+- pkg/webmachine-0.1.0/lib/webmachine/resource/encodings.rb
+- pkg/webmachine-0.1.0/lib/webmachine/resource.rb
+- pkg/webmachine-0.1.0/lib/webmachine/response.rb
+- pkg/webmachine-0.1.0/lib/webmachine/streaming.rb
+- pkg/webmachine-0.1.0/lib/webmachine/translation.rb
+- pkg/webmachine-0.1.0/lib/webmachine/version.rb
+- pkg/webmachine-0.1.0/lib/webmachine.rb
+- pkg/webmachine-0.1.0/Rakefile
+- pkg/webmachine-0.1.0/README.md
+- pkg/webmachine-0.1.0/spec/spec_helper.rb
+- pkg/webmachine-0.1.0/spec/tests.org
+- pkg/webmachine-0.1.0/spec/webmachine/decision/conneg_spec.rb
+- pkg/webmachine-0.1.0/spec/webmachine/decision/flow_spec.rb
+- pkg/webmachine-0.1.0/spec/webmachine/dispatcher/route_spec.rb
+- pkg/webmachine-0.1.0/spec/webmachine/dispatcher_spec.rb
+- pkg/webmachine-0.1.0/spec/webmachine/headers_spec.rb
+- pkg/webmachine-0.1.0/spec/webmachine/request_spec.rb
+- pkg/webmachine-0.1.0/webmachine.gemspec
+- pkg/webmachine-0.1.0.gem
 - Rakefile
 - README.md
 - spec/spec_helper.rb
 - spec/tests.org
+- spec/webmachine/configuration_spec.rb
 - spec/webmachine/decision/conneg_spec.rb
 - spec/webmachine/decision/flow_spec.rb
+- spec/webmachine/decision/helpers_spec.rb
 - spec/webmachine/dispatcher/route_spec.rb
 - spec/webmachine/dispatcher_spec.rb
+- spec/webmachine/errors_spec.rb
 - spec/webmachine/headers_spec.rb
+- spec/webmachine/media_type_spec.rb
 - spec/webmachine/request_spec.rb
 - webmachine.gemspec
 - .gitignore
-homepage: http://seancribbs.github.com/webmachine.rb
+homepage: http://github.com/seancribbs/webmachine-ruby
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -128,10 +182,14 @@ summary: webmachine is a toolkit for building HTTP applications,
 test_files:
 - spec/spec_helper.rb
 - spec/tests.org
+- spec/webmachine/configuration_spec.rb
 - spec/webmachine/decision/conneg_spec.rb
 - spec/webmachine/decision/flow_spec.rb
+- spec/webmachine/decision/helpers_spec.rb
 - spec/webmachine/dispatcher/route_spec.rb
 - spec/webmachine/dispatcher_spec.rb
+- spec/webmachine/errors_spec.rb
 - spec/webmachine/headers_spec.rb
+- spec/webmachine/media_type_spec.rb
 - spec/webmachine/request_spec.rb
 - .gitignore