steam 0.0.6 → 0.0.7

data/lib/steam/request.rb

@@ -40,34 +40,45 @@ module Steam
       super.merge(headers)
     end
 
-    def method=(method)
-      @env['REQUEST_METHOD'] = method
+    def url=(url)
+      url = URI.parse(url)
+      self.path   = url.path
+      self.scheme = url.scheme if url.scheme
+      self.host   = url.host   if url.host
+      self.port   = url.port   if url.port
+      self.query  = url.query  if url.query
     end
+    alias :uri :url
+    alias :uri= :url=
 
-    def uri=(uri)
-      uri = URI.parse(uri)
-      self.path   = uri.path
-      self.query  = uri.query  if uri.query
-      self.scheme = uri.scheme if uri.scheme
-      self.port   = uri.port   if uri.port
+    def method=(method)
+      @env.merge!(
+        'REQUEST_METHOD' => method
+      )
     end
-    alias url= uri=
     
     def scheme=(scheme)
       @env.merge!(
         'rack.url_scheme'  => scheme,
         'rack.test.scheme' => scheme
       )
+      self.port = nil # reset the port so we switch according to the protocol
     end
+    alias :protocol :scheme
+    alias :protocol= :scheme=
     
     def host=(host)
+      host, self.port = host.split(':')
       @env.merge!(
+        'HTTP_HOST'      => host,
         'rack.test.host' => host
       )
     end
     
     def port=(port)
+      port ||= protocol == 'https' ? 443 : 80
       @env.merge!(
+        'SERVER_PORT'    => port,
         'rack.test.port' => port
       )
     end

data/lib/steam/version.rb

@@ -1,3 +1,3 @@
 module Steam
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency