ronin-web 0.3.0.pre1 → 0.3.0.pre2

data/ChangeLog.md

@@ -4,6 +4,7 @@
 * Require nokogiri ~> 1.4.
 * Require mechanize ~> 1.0.
 * Require spidr ~> 0.2.
+* Require rack ~> 1.3.
 * Require sinatra ~> 1.2.
 * Require data_paths ~> 0.3.
 * Require ronin-support ~> 0.2.

data/README.md

@@ -165,7 +165,8 @@ Serve files via a Web Server:
   * [libxslt1](http://xmlsoft.org/XSLT/)
 * [mechanize](http://github.com/tenderlove/mechanize) ~> 1.0
 * [spidr](http://github.com/postmodern/spidr) ~> 0.2
-* [sinatra](http://github.com/sinatra/sinatra) ~> 1.1
+* [rack](http://github.com/rack/rack) ~> 1.3
+* [sinatra](http://github.com/sinatra/sinatra) ~> 1.2
 * [data_paths](http://github.com/postmodern/data_paths) ~> 0.3
 * [ronin-support](http://github.com/ronin-ruby/ronin-support) ~> 0.2
 * [ronin](http://github.com/ronin-ruby/ronin) ~> 1.1

data/gemspec.yml

@@ -16,14 +16,15 @@ dependencies:
   nokogiri: ~> 1.4
   mechanize: ~> 1.0
   spidr: ~> 0.2
+  rack: ~> 1.3
   sinatra: ~> 1.2
   # data_paths: ~> 0.3
   data_paths: ~> 0.3.0.rc1
   # Ronin dependencies:
   # ronin-support: ~> 0.2
-  ronin-support: ~> 0.2.0.rc1
+  ronin-support: ~> 0.2.0.rc2
   # ronin: ~> 1.1
-  ronin: ~> 1.1.0.rc1
+  ronin: ~> 1.1.0.rc3
 
 development_dependencies:
   bundler: ~> 1.0.10

data/lib/ronin/web/middleware/directories.rb

@@ -153,7 +153,9 @@ module Ronin
 
             return_file = proc { |local_path|
               if File.file?(local_path)
-                print_info "Returning file #{local_path.dump}"
+                request = Request.new(env)
+
+                print_info "Returning file #{local_path.dump} for #{request.address}"
                 return response_for(local_path)
               end
             }

data/lib/ronin/web/middleware/files.rb

@@ -128,7 +128,9 @@ module Ronin
                       end
 
             if matched
-              print_info "Returning file #{local_path.dump}"
+              request = Request.new(env)
+
+              print_info "Returning file #{local_path.dump} for #{request.address}"
               return response_for(local_path)
             end
           end

data/lib/ronin/web/middleware/proxy.rb

@@ -197,7 +197,7 @@ module Ronin
             return super(env)
           end
 
-          print_info "Proxying #{request.url}"
+          print_info "Proxying #{request.url} for #{request.address}"
           request.headers.each do |name,value|
             print_debug "  #{name}: #{value}"
           end
@@ -206,7 +206,7 @@ module Ronin
 
           @every_response_block.call(response) if @every_response_block
 
-          print_info "Returning proxied response."
+          print_info "Returning proxied response for #{request.address}"
           response.headers.each do |name,value|
             print_debug "  #{name}: #{value}"
           end

data/lib/ronin/web/middleware/request.rb

@@ -29,6 +29,27 @@ module Ronin
     module Middleware
       class Request < Rack::Request
 
+        #
+        # Returns the remote IP address and port for the request.
+        #
+        # @param [Hash] env
+        #   The request env Hash.
+        #
+        # @return [String]
+        #   The IP address and port number.
+        #
+        # @since 0.3.0
+        #
+        # @api semipublic
+        #
+        def address
+          if env.has_key?('REMOTE_PORT')
+            "#{ip}:#{env['REMOTE_PORT']}"
+          else
+            ip
+          end
+        end
+
         #
         # The HTTP Headers for the request.
         #
@@ -42,7 +63,7 @@ module Ronin
         def headers
           headers = {}
 
-          self.env.each do |name,value|
+          env.each do |name,value|
             if name =~ /^HTTP_/
               header_name = Network::HTTP.header_name(name.sub('HTTP_',''))
               headers[header_name] = value

data/lib/ronin/web/middleware/router.rb

@@ -153,7 +153,7 @@ module Ronin
 
           @routes.each do |rule,app|
             if rule.match?(request)
-              print_info "Routing #{request.url}"
+              print_info "Routing #{request.url} for #{request.address}"
               return app.call(env)
             end
           end

data/lib/ronin/web/version.rb

@@ -23,6 +23,6 @@
 module Ronin
   module Web
     # Ronin Web Version
-    VERSION = '0.3.0.pre1'
+    VERSION = '0.3.0.pre2'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: ronin-web
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.3.0.pre1
+  version: 0.3.0.pre2
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 Z
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -46,52 +46,63 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: "1.3"
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: data_paths
+  name: sinatra
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.0.rc1
+        version: "1.2"
   type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ronin-support
+  name: data_paths
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0.rc1
+        version: 0.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ronin
+  name: ronin-support
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc1
+        version: 0.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: ronin
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.0.rc3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,10 +110,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,7 +121,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: Ronin Web is a Ruby library for Ronin that provides support for web scraping and spidering functionality.
 email: 
 - postmodern.mod3@gmail.com