xproxy 0.0.1 → 0.1.0

data/lib/xproxy.rb

@@ -1,3 +1,8 @@
 require 'xproxy/version'
-require 'xproxy/map'
-require 'xproxy/proxy'
+require 'xproxy/application'
+
+module XProxy
+  def self.new(*args, &block)
+    Application.new(*args, &block)
+  end
+end

data/lib/xproxy/application.rb

@@ -0,0 +1,21 @@
+require 'rack/header'
+require 'rack/proxy'
+
+module XProxy
+  class Application
+    def initialize(host, headers)
+      @host, @headers = host, headers
+    end
+    
+    def call(env)      
+      host, headers = @host, @headers
+      
+      app = Rack::Builder.new do
+        use Rack::Header, headers        
+        run Rack::Proxy.new(host)
+      end
+      
+      app.call(env)
+    end
+  end
+end

data/lib/xproxy/version.rb

@@ -1,3 +1,3 @@
 module XProxy
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/xproxy.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   
   gem.add_dependency 'rack', '~> 1.4.1'
+  gem.add_dependency 'rackheader', '~> 0.0.1'
+  gem.add_dependency 'rackproxy', '~> 0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rackheader
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: rackproxy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: A Rack compatible HTTP Proxy
 email:
 - ajjahn@gmail.com
@@ -56,8 +88,7 @@ files:
 - README.md
 - Rakefile
 - lib/xproxy.rb
-- lib/xproxy/map.rb
-- lib/xproxy/proxy.rb
+- lib/xproxy/application.rb
 - lib/xproxy/version.rb
 - xproxy.gemspec
 homepage: https://github.com/ajjahn/xproxy
@@ -74,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4049345879749238519
+      hash: -66576529968765014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4049345879749238519
+      hash: -66576529968765014
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.18

data/lib/xproxy/map.rb

@@ -1,46 +0,0 @@
-require 'net/http'
-
-module XProxy
-  class Map < Hash
-    
-    def match(path, options={})
-      self[path] = options
-    end
-    
-    def translate(request)
-      request_path = normalize_path(request.path)
-      uri = nil
-      each do |match_path, options|
-        match_path = normalize_path(match_path)
-        
-        puts request_path
-        
-        if request_path.start_with?(match_path)
-          request.path = options[:include_match] ? request.path : strip_match(request.path, match_path)
-          uri = translate_uri(URI(options[:to]), request)
-        end
-      end
-      
-      uri
-    end
-    
-  private
-    
-    def normalize_path(path)
-      "/#{path.split('/').delete_if(&:empty?).join('/')}"
-    end
-    
-    def strip_match(request_path, match_path)
-      normalize_path(request_path.gsub(match_path, ''))
-    end
-    
-    def translate_uri(to ,from)
-      to.path = from.path
-      to.opaque = from.opaque
-      to.query = from.query
-      to.fragment = from.fragment
-      
-      to
-    end
-  end
-end

data/lib/xproxy/proxy.rb

@@ -1,44 +0,0 @@
-require 'net/http'
-require 'rack/request'
-
-module XProxy
-  class Proxy
-
-      def initialize(app, &block)
-        @app = app
-        @map = XProxy::Map.new
-        @map.instance_exec(&block)
-      end
-
-      def call(env)
-        request = Rack::Request.new(env)
-        
-        return @app.call(env) unless uri = @map.translate(URI(request.url))
-              
-        # Get the request method
-        request_method = request.request_method.downcase
-        request_method[0..0] = request_method[0..0].upcase
-
-        forward_request = Net::HTTP.const_get(request_method).new(uri.request_uri)
-        if forward_request.request_body_permitted? and request.body
-          forward_request.body_stream = request.body
-          forward_request.content_length = request.content_length
-          forward_request.content_type = request.content_type
-        end
-
-        forward_request["Referer"] = request.referer
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = uri.scheme == 'https' ? true : false
-        forward_response = http.request(forward_request)
-
-        headers = {}
-        forward_response.each_header do |k,v|
-          headers[k] = v unless k.to_s =~ /status/i
-        end
-        headers['Access-Control-Allow-Origin'] = '*'
-
-        [forward_response.code.to_i, headers, [forward_response.read_body]]
-      end
-  end
-end